1

winsea-haixin-plugin-base/src/main/java/com/yh/saas/plugin/base/entity/CommonBillOperateHis.java

@@ -78,6 +78,10 @@ public class CommonBillOperateHis extends BaseModel<CommonBillOperateHis> {
      * 签名路径
      */
     private String signPath;
+    /**
+     * 业务历史
+     */
+    private String businessHistory;
     /**
      * 审批结果
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ClockInfoServiceImpl.java

@@ -4,8 +4,11 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
+import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.winsea.svc.base.workflow.entity.Workflow;
 import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
+import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.ClockInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.FuelFillingInfo;
@@ -38,6 +41,8 @@ public class ClockInfoServiceImpl extends ServiceImpl<ClockInfoMapper, ClockInfo
     private IClockInfoService clockInfoService;
     @Autowired
     private INewWorkflowService workflowService;
+    @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
 
     /**
      * 添加打卡信息
@@ -263,6 +268,18 @@ public class ClockInfoServiceImpl extends ServiceImpl<ClockInfoMapper, ClockInfo
                 clockInfoService.updateById(clockInfo);
                 workflowService.activateInstance(clockInfo.getWorkflowId(), clockInfo.getId());
             }
+
+            //  添加提交历史
+            CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+            commonBillOperateHis.setBillId(clockInfo.getId());
+            commonBillOperateHis.setId(IdGenerator.generateUUID());
+            commonBillOperateHis.setBillType("BUKA-APPROVE");
+            commonBillOperateHis.setOperateDate(new Date());
+            commonBillOperateHis.setOperateUser(clockInfo.getCreateUserId());
+            JSONObject jsonObject = (JSONObject) JSONObject.toJSON(clockInfo);
+            commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+            commonBillOperateHisService.create(commonBillOperateHis);
+
         }
         return "OK";
     }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CollectionWarehousingRecordServiceImpl.java

@@ -13,6 +13,8 @@ import com.winsea.svc.base.security.entity.User;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.winsea.svc.base.workflow.entity.Workflow;
 import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
+import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.exception.YException;
@@ -65,7 +67,8 @@ public class CollectionWarehousingRecordServiceImpl extends ServiceImpl<Collecti
     private IContractManagementInfoService contractManagementInfoService;
     @Autowired
     private IContractGoodsInfoService contractGoodsInfoService;
-
+    @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
     @Value("${file-root-path}")
     private String localPath;
 
@@ -215,6 +218,19 @@ public class CollectionWarehousingRecordServiceImpl extends ServiceImpl<Collecti
                     this.updateById(warehousingRecord);
                     workflowService.activateInstance(warehousingRecord.getWorkflowId(), warehousingRecord.getId());
                 }
+
+                //  添加提交历史
+                CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+                commonBillOperateHis.setBillId(warehousingRecord.getId());
+                commonBillOperateHis.setId(IdGenerator.generateUUID());
+                commonBillOperateHis.setBillType("COLLECTION-WAREHOUSING-RECORD");
+                commonBillOperateHis.setOperateDate(new Date());
+                commonBillOperateHis.setOperateUser(warehousingRecord.getCreateUserId());
+                JSONObject jsonObject = (JSONObject) JSONObject.toJSON(warehousingRecord);
+                commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+                commonBillOperateHisService.create(commonBillOperateHis);
+
+
             }
 
         }
@@ -279,6 +295,20 @@ public class CollectionWarehousingRecordServiceImpl extends ServiceImpl<Collecti
                 this.updateById(collectionWarehousingRecord);
                 workflowService.activateInstance(collectionWarehousingRecord.getWorkflowId(), collectionWarehousingRecord.getId());
             }
+
+
+            //  添加提交历史
+            CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+            commonBillOperateHis.setBillId(collectionWarehousingRecord.getId());
+            commonBillOperateHis.setId(IdGenerator.generateUUID());
+            commonBillOperateHis.setBillType("COLLECTION-WAREHOUSING-RECORD");
+            commonBillOperateHis.setOperateDate(new Date());
+            commonBillOperateHis.setOperateUser(collectionWarehousingRecord.getCreateUserId());
+            JSONObject jsonObject = (JSONObject) JSONObject.toJSON(collectionWarehousingRecord);
+            commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+            commonBillOperateHisService.create(commonBillOperateHis);
+
+
         }
         if (one) {
             return "OK";

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ContractCostInfoServiceImpl.java

@@ -7,6 +7,7 @@ import com.google.common.collect.Lists;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.winsea.svc.base.workflow.entity.Workflow;
 import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
 import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
@@ -21,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -44,7 +46,8 @@ public class ContractCostInfoServiceImpl extends ServiceImpl<ContractCostInfoMap
     private IReveExpeInfoService reveExpeInfoService;
     @Autowired
     private ICommonBillOperateHisService billOperateHisService;
-
+    @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
 
     /**
      * 添加
@@ -113,6 +116,20 @@ public class ContractCostInfoServiceImpl extends ServiceImpl<ContractCostInfoMap
                 this.updateById(contractCostInfo);
                 workflowService.activateInstance(contractCostInfo.getWorkflowId(), contractCostInfo.getId());
             }
+
+
+            //  添加提交历史
+            CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+            commonBillOperateHis.setBillId(contractCostInfo.getId());
+            commonBillOperateHis.setId(IdGenerator.generateUUID());
+            commonBillOperateHis.setBillType("NON-CONTRACT-APPROVE");
+            commonBillOperateHis.setOperateDate(new Date());
+            commonBillOperateHis.setOperateUser(contractCostInfo.getCreateUserId());
+            JSONObject jsonObject = (JSONObject) JSONObject.toJSON(contractCostInfo);
+            commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+            commonBillOperateHisService.create(commonBillOperateHis);
+
+
         }
         return "ok";
     }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ContractManagementInfoServiceImpl.java

@@ -11,6 +11,7 @@ import com.winsea.svc.base.workflow.entity.Workflow;
 import com.winsea.svc.notice.entity.base.BaseNotice;
 import com.winsea.svc.notice.service.INoticeService;
 import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
 import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
@@ -86,6 +87,8 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
     @Autowired
     private INewWorkflowService workflowService;
     @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
+    @Autowired
     private INoticeService noticeService;
     @Autowired
     private IPriceConfirmationSheetService priceConfirmationSheetService;
@@ -279,6 +282,19 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                     this.updateById(contractManagementInfo);
                     workflowService.activateInstance(contractManagementInfo.getWorkflowId(), contractManagementInfo.getId());
                 }
+
+
+                //  添加提交历史
+                CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+                commonBillOperateHis.setBillId(contractManagementInfo.getId());
+                commonBillOperateHis.setId(IdGenerator.generateUUID());
+                commonBillOperateHis.setBillType("SALE-CONTRACT-APPROVE");
+                commonBillOperateHis.setOperateDate(new Date());
+                commonBillOperateHis.setOperateUser(contractManagementInfo.getCreateUserId());
+                JSONObject jsonObject = (JSONObject) JSONObject.toJSON(contractManagementInfo);
+                commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+                commonBillOperateHisService.create(commonBillOperateHis);
+
             }
             //代储合同
             else if ("1".equals(contractManagementInfo.getContractType())&&"代储合同".equals(contractManagementInfo.getAgreementType())) {
@@ -286,7 +302,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                 // 不是退回的单子
                 if (isStartWorkflow) {
                     Workflow workflow = workflowService
-                            .findLatestWorkflowByBusinessCodeByApp(contractManagementInfo.getCompId(), "DAICHU-CONTRACT-APPROVE ");
+                            .findLatestWorkflowByBusinessCodeByApp(contractManagementInfo.getCompId(), "DAICHU-CONTRACT-APPROVE");
                     // 没配置审核流程，直接结束并处理信息
                     if (workflow == null) {
                         throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
@@ -306,6 +322,17 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                     this.updateById(contractManagementInfo);
                     workflowService.activateInstance(contractManagementInfo.getWorkflowId(), contractManagementInfo.getId());
                 }
+                //  添加提交历史
+                CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+                commonBillOperateHis.setBillId(contractManagementInfo.getId());
+                commonBillOperateHis.setId(IdGenerator.generateUUID());
+                commonBillOperateHis.setBillType("DAICHU-CONTRACT-APPROVE");
+                commonBillOperateHis.setOperateDate(new Date());
+                commonBillOperateHis.setOperateUser(contractManagementInfo.getCreateUserId());
+                JSONObject jsonObject = (JSONObject) JSONObject.toJSON(contractManagementInfo);
+                commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+                commonBillOperateHisService.create(commonBillOperateHis);
+
             }
             //采购合同
             else if("2".equals(contractManagementInfo.getContractType())){
@@ -333,6 +360,17 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                     this.updateById(contractManagementInfo);
                     workflowService.activateInstance(contractManagementInfo.getWorkflowId(), contractManagementInfo.getId());
                 }
+                //  添加提交历史
+                CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+                commonBillOperateHis.setBillId(contractManagementInfo.getId());
+                commonBillOperateHis.setId(IdGenerator.generateUUID());
+                commonBillOperateHis.setBillType("BUY-CONTRACT-APPROVE");
+                commonBillOperateHis.setOperateDate(new Date());
+                commonBillOperateHis.setOperateUser(contractManagementInfo.getCreateUserId());
+                JSONObject jsonObject = (JSONObject) JSONObject.toJSON(contractManagementInfo);
+                commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+                commonBillOperateHisService.create(commonBillOperateHis);
+
 
             }
             //收购合同
@@ -362,6 +400,17 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                     workflowService.activateInstance(contractManagementInfo.getWorkflowId(), contractManagementInfo.getId());
                 }
 
+                //  添加提交历史
+                CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+                commonBillOperateHis.setBillId(contractManagementInfo.getId());
+                commonBillOperateHis.setId(IdGenerator.generateUUID());
+                commonBillOperateHis.setBillType("SHOU-CONTRACT-APPROVE");
+                commonBillOperateHis.setOperateDate(new Date());
+                commonBillOperateHis.setOperateUser(contractManagementInfo.getCreateUserId());
+                JSONObject jsonObject = (JSONObject) JSONObject.toJSON(contractManagementInfo);
+                commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+                commonBillOperateHisService.create(commonBillOperateHis);
+
             }
             //代收合同
             else {
@@ -390,6 +439,17 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                     workflowService.activateInstance(contractManagementInfo.getWorkflowId(), contractManagementInfo.getId());
                 }
 
+                //  添加提交历史
+                CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+                commonBillOperateHis.setBillId(contractManagementInfo.getId());
+                commonBillOperateHis.setId(IdGenerator.generateUUID());
+                commonBillOperateHis.setBillType("DAISHOU-CONTRACT-APPROVE");
+                commonBillOperateHis.setOperateDate(new Date());
+                commonBillOperateHis.setOperateUser(contractManagementInfo.getCreateUserId());
+                JSONObject jsonObject = (JSONObject) JSONObject.toJSON(contractManagementInfo);
+                commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+                commonBillOperateHisService.create(commonBillOperateHis);
+
             }
         }
 
@@ -474,6 +534,17 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                         this.updateById(contractManagementInfo1);
                         workflowService.activateInstance(contractManagementInfo1.getWorkflowId(), contractManagementInfo1.getId());
                     }
+
+                    //  添加提交历史
+                    CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+                    commonBillOperateHis.setBillId(contractManagementInfo1.getId());
+                    commonBillOperateHis.setId(IdGenerator.generateUUID());
+                    commonBillOperateHis.setBillType("SALE-CONTRACT-APPROVE");
+                    commonBillOperateHis.setOperateDate(new Date());
+                    commonBillOperateHis.setOperateUser(contractManagementInfo1.getCreateUserId());
+                    JSONObject jsonObject = (JSONObject) JSONObject.toJSON(contractManagementInfo1);
+                    commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+                    commonBillOperateHisService.create(commonBillOperateHis);
                 }
                 //代储合同
                 else if ("1".equals(contractManagementInfo1.getContractType())&&"代储合同".equals(contractManagementInfo1.getAgreementType())) {
@@ -481,7 +552,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                     // 不是退回的单子
                     if (isStartWorkflow) {
                         Workflow workflow = workflowService
-                                .findLatestWorkflowByBusinessCodeByApp(contractManagementInfo1.getCompId(), "DAICHU-CONTRACT-APPROVE ");
+                                .findLatestWorkflowByBusinessCodeByApp(contractManagementInfo1.getCompId(), "DAICHU-CONTRACT-APPROVE");
                         // 没配置审核流程，直接结束并处理信息
                         if (workflow == null) {
                             throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
@@ -501,6 +572,18 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                         this.updateById(contractManagementInfo1);
                         workflowService.activateInstance(contractManagementInfo1.getWorkflowId(), contractManagementInfo1.getId());
                     }
+
+
+                    //  添加提交历史
+                    CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+                    commonBillOperateHis.setBillId(contractManagementInfo1.getId());
+                    commonBillOperateHis.setId(IdGenerator.generateUUID());
+                    commonBillOperateHis.setBillType("DAICHU-CONTRACT-APPROVE");
+                    commonBillOperateHis.setOperateDate(new Date());
+                    commonBillOperateHis.setOperateUser(contractManagementInfo1.getCreateUserId());
+                    JSONObject jsonObject = (JSONObject) JSONObject.toJSON(contractManagementInfo1);
+                    commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+                    commonBillOperateHisService.create(commonBillOperateHis);
                 }
                 //采购合同
                 else if("2".equals(contractManagementInfo1.getContractType())){
@@ -529,6 +612,17 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                         workflowService.activateInstance(contractManagementInfo1.getWorkflowId(), contractManagementInfo1.getId());
                     }
 
+                    //  添加提交历史
+                    CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+                    commonBillOperateHis.setBillId(contractManagementInfo1.getId());
+                    commonBillOperateHis.setId(IdGenerator.generateUUID());
+                    commonBillOperateHis.setBillType("BUY-CONTRACT-APPROVE");
+                    commonBillOperateHis.setOperateDate(new Date());
+                    commonBillOperateHis.setOperateUser(contractManagementInfo1.getCreateUserId());
+                    JSONObject jsonObject = (JSONObject) JSONObject.toJSON(contractManagementInfo1);
+                    commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+                    commonBillOperateHisService.create(commonBillOperateHis);
+
                 }
                 //收购合同
                 else if("3".equals(contractManagementInfo1.getContractType())&&"收购合同".equals(contractManagementInfo1.getAgreementType())){
@@ -557,6 +651,17 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                         workflowService.activateInstance(contractManagementInfo1.getWorkflowId(), contractManagementInfo1.getId());
                     }
 
+                    //  添加提交历史
+                    CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+                    commonBillOperateHis.setBillId(contractManagementInfo1.getId());
+                    commonBillOperateHis.setId(IdGenerator.generateUUID());
+                    commonBillOperateHis.setBillType("SHOU-CONTRACT-APPROVE");
+                    commonBillOperateHis.setOperateDate(new Date());
+                    commonBillOperateHis.setOperateUser(contractManagementInfo1.getCreateUserId());
+                    JSONObject jsonObject = (JSONObject) JSONObject.toJSON(contractManagementInfo1);
+                    commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+                    commonBillOperateHisService.create(commonBillOperateHis);
+
                 }
                 //代收合同
                 else {
@@ -585,6 +690,17 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                         workflowService.activateInstance(contractManagementInfo1.getWorkflowId(), contractManagementInfo1.getId());
                     }
                     this.updateById(contractManagementInfo1);
+
+                    //  添加提交历史
+                    CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+                    commonBillOperateHis.setBillId(contractManagementInfo1.getId());
+                    commonBillOperateHis.setId(IdGenerator.generateUUID());
+                    commonBillOperateHis.setBillType("DAISHOU-CONTRACT-APPROVE");
+                    commonBillOperateHis.setOperateDate(new Date());
+                    commonBillOperateHis.setOperateUser(contractManagementInfo1.getCreateUserId());
+                    JSONObject jsonObject = (JSONObject) JSONObject.toJSON(contractManagementInfo1);
+                    commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+                    commonBillOperateHisService.create(commonBillOperateHis);
                 }
             }
             contractGoodsInfoService.updateById(contractManagementInfo.getContractGoodsInfo());

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ExpenseInfoServiceImpl.java

@@ -22,6 +22,7 @@ import com.winsea.svc.notice.entity.base.BaseNotice;
 import com.winsea.svc.notice.service.INoticeService;
 import com.winsea.svc.notice.service.INoticeTaskService;
 import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
 import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
@@ -70,6 +71,8 @@ import java.util.stream.Collectors;
 public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, ExpenseInfo> implements IExpenseInfoService {
     @Autowired
     private INewWorkflowService workflowService;
+    @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
     @SofaReference
     private ICommonRoleResourceService roleResourceService;
     @Autowired
@@ -437,6 +440,18 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
                 this.updateById(expenseInfo);
                 workflowService.activateInstance(expenseInfo.getWorkflowId(), expenseInfo.getId());
             }
+
+            //  添加提交历史
+            CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+            commonBillOperateHis.setBillId(expenseInfo.getId());
+            commonBillOperateHis.setId(IdGenerator.generateUUID());
+            commonBillOperateHis.setBillType("FEIYONGGUANLI-APPROVE");
+            commonBillOperateHis.setOperateDate(new Date());
+            commonBillOperateHis.setOperateUser(expenseInfo.getCreateUserId());
+            JSONObject jsonObject = (JSONObject) JSONObject.toJSON(expenseInfo);
+            commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+            commonBillOperateHisService.create(commonBillOperateHis);
+
         }
         if (flag == 1) {
             return "合同请款金额超出总粮款！";
@@ -666,6 +681,18 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
                 this.updateById(expenseInfo);
                 workflowService.activateInstance(expenseInfo.getWorkflowId(), expenseInfo.getId());
             }
+
+            //  添加提交历史
+            CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+            commonBillOperateHis.setBillId(expenseInfo.getId());
+            commonBillOperateHis.setId(IdGenerator.generateUUID());
+            commonBillOperateHis.setBillType("FEIYONGGUANLI-APPROVE");
+            commonBillOperateHis.setOperateDate(new Date());
+            commonBillOperateHis.setOperateUser(expenseInfo.getCreateUserId());
+            JSONObject jsonObject = (JSONObject) JSONObject.toJSON(expenseInfo);
+            commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+            commonBillOperateHisService.create(commonBillOperateHis);
+
         }
         //驳回分配
         else if ("5".equals(expenseInfo.getFlag())) {
@@ -724,6 +751,17 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
                 this.updateById(expenseInfo);
                 workflowService.activateInstance(expenseInfo.getWorkflowId(), expenseInfo.getId());
             }
+
+            //  添加提交历史
+            CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+            commonBillOperateHis.setBillId(expenseInfo.getId());
+            commonBillOperateHis.setId(IdGenerator.generateUUID());
+            commonBillOperateHis.setBillType("FEIYONGGUANLI-APPROVE");
+            commonBillOperateHis.setOperateDate(new Date());
+            commonBillOperateHis.setOperateUser(expenseInfo.getCreateUserId());
+            JSONObject jsonObject = (JSONObject) JSONObject.toJSON(expenseInfo);
+            commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+            commonBillOperateHisService.create(commonBillOperateHis);
         }
         // 主表信息编辑
         this.updateById(expenseInfo);

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/FillingDetailInfoServiceImpl.java

@@ -1,9 +1,12 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.alipay.sofa.rpc.common.utils.StringUtils;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.winsea.svc.base.workflow.entity.Workflow;
 import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
+import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.FillingDetailInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.FuelFillingInfo;
@@ -20,6 +23,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -37,6 +41,8 @@ public class FillingDetailInfoServiceImpl extends ServiceImpl<FillingDetailInfoM
     private IFuelFillingInfoService fuelFillingInfoService;
     @Autowired
     private INewWorkflowService workflowService;
+    @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
     /**
      * 添加明细
      * @param fillingDetailInfo
@@ -89,6 +95,17 @@ public class FillingDetailInfoServiceImpl extends ServiceImpl<FillingDetailInfoM
                 fuelFillingInfoService.updateById(fuelFillingInfo);
                 workflowService.activateInstance(fuelFillingInfo.getWorkflowId(), fuelFillingInfo.getId());
             }
+
+            //  添加提交历史
+            CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+            commonBillOperateHis.setBillId(fuelFillingInfo.getId());
+            commonBillOperateHis.setId(IdGenerator.generateUUID());
+            commonBillOperateHis.setBillType("JIAYOU-SHENHE-APPROVE");
+            commonBillOperateHis.setOperateDate(new Date());
+            commonBillOperateHis.setOperateUser(fuelFillingInfo.getCreateUserId());
+            JSONObject jsonObject = (JSONObject) JSONObject.toJSON(fuelFillingInfo);
+            commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+            commonBillOperateHisService.create(commonBillOperateHis);
         }
         return "OK";
     }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/InOutWarehouseTaskServiceImpl.java

@@ -19,6 +19,7 @@ import com.winsea.svc.notice.service.INoticeService;
 import com.winsea.svc.notice.service.INoticeTaskService;
 import com.yh.saas.common.support.util.IdGenerator;
 //import com.yh.saas.common.support.util.StringUtils;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
 import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
@@ -57,6 +58,8 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
     @Autowired
     private IInOutWarehouseTaskService inOutWarehouseTaskService;
     @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
+    @Autowired
     private ICommonBillOperateHisService billOperateHisService;
     @Autowired
     private INewWorkflowService workflowService;
@@ -193,6 +196,17 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
                 this.updateById(inOutWarehouseTask);
                 workflowService.activateInstance(inOutWarehouseTask.getWorkflowId(), inOutWarehouseTask.getId());
             }
+            //  添加提交历史
+            CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+            commonBillOperateHis.setBillId(inOutWarehouseTask.getId());
+            commonBillOperateHis.setId(IdGenerator.generateUUID());
+            commonBillOperateHis.setBillType("INOUTTASK-TASK-APPROVE");
+            commonBillOperateHis.setOperateDate(new Date());
+            commonBillOperateHis.setOperateUser(inOutWarehouseTask.getCreateUserId());
+            JSONObject jsonObject = (JSONObject) JSONObject.toJSON(inOutWarehouseTask);
+            commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+            commonBillOperateHisService.create(commonBillOperateHis);
+
         }
         //  有id是修改
         else {
@@ -254,6 +268,18 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
                 this.updateById(inOutWarehouseTask);
                 workflowService.activateInstance(inOutWarehouseTask.getWorkflowId(), inOutWarehouseTask.getId());
             }
+
+            //  添加提交历史
+            CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+            commonBillOperateHis.setBillId(inOutWarehouseTask.getId());
+            commonBillOperateHis.setId(IdGenerator.generateUUID());
+            commonBillOperateHis.setBillType("INOUTTASK-TASK-APPROVE");
+            commonBillOperateHis.setOperateDate(new Date());
+            commonBillOperateHis.setOperateUser(inOutWarehouseTask.getCreateUserId());
+            JSONObject jsonObject = (JSONObject) JSONObject.toJSON(inOutWarehouseTask);
+            commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+            commonBillOperateHisService.create(commonBillOperateHis);
+
             List<String> roleIdList = new ArrayList<>();
             roleIdList = roleResourceService.getBindRoleIdsByResourceIds(AuthSecurityUtils.getCurrentUserInfo().getCompId(),
                     Lists.newArrayList("warehouseInfoTask-Audit"));

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/LeaveInfoServiceImpl.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
 import com.winsea.svc.base.workflow.entity.Workflow;
 import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
+import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.entity.ClockInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.LeaveInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.QualityInspectionManagement;
@@ -42,7 +44,8 @@ public class LeaveInfoServiceImpl extends ServiceImpl<LeaveInfoMapper, LeaveInfo
     private INewWorkflowService workflowService;
     @Autowired
     private ILeaveInfoService leaveInfoService;
-
+    @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
     /**
      * 添加请假信息
      *
@@ -115,6 +118,18 @@ public class LeaveInfoServiceImpl extends ServiceImpl<LeaveInfoMapper, LeaveInfo
             leaveInfoService.updateById(leaveInfo);
             workflowService.activateInstance(leaveInfo.getWorkflowId(), leaveInfo.getId());
         }
+        //  添加提交历史
+        CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+        commonBillOperateHis.setBillId(leaveInfo.getId());
+        commonBillOperateHis.setId(IdGenerator.generateUUID());
+        commonBillOperateHis.setBillType("QINGJIA-APPROVE");
+        commonBillOperateHis.setOperateDate(new Date());
+        commonBillOperateHis.setOperateUser(leaveInfo.getCreateUserId());
+        JSONObject jsonObject = (JSONObject) JSONObject.toJSON(leaveInfo);
+        commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+        commonBillOperateHisService.create(commonBillOperateHis);
+
+
         //设置日期格式
         SimpleDateFormat start = new SimpleDateFormat("yyyyMMdd");
         Calendar s = Calendar.getInstance();

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/NonContractExpensesServiceImpl.java

@@ -6,6 +6,7 @@ import com.google.common.collect.Lists;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.winsea.svc.base.workflow.entity.Workflow;
 import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
 import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
@@ -23,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -43,7 +45,8 @@ public class NonContractExpensesServiceImpl extends ServiceImpl<NonContractExpen
     private IReveExpeInfoService reveExpeInfoService;
     @Autowired
     private ICommonBillOperateHisService billOperateHisService;
-
+    @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
 
     @Override
     public String addInfo(NonContractExpenses nonContractExpenses) {
@@ -113,6 +116,18 @@ public class NonContractExpensesServiceImpl extends ServiceImpl<NonContractExpen
                 this.updateById(nonContractExpenses);
                 workflowService.activateInstance(nonContractExpenses.getWorkflowId(), nonContractExpenses.getId());
             }
+
+            //  添加提交历史
+            CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+            commonBillOperateHis.setBillId(nonContractExpenses.getId());
+            commonBillOperateHis.setId(IdGenerator.generateUUID());
+            commonBillOperateHis.setBillType("EX-CONTRACT-APPROVE");
+            commonBillOperateHis.setOperateDate(new Date());
+            commonBillOperateHis.setOperateUser(nonContractExpenses.getCreateUserId());
+            JSONObject jsonObject = (JSONObject) JSONObject.toJSON(nonContractExpenses);
+            commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+            commonBillOperateHisService.create(commonBillOperateHis);
+
         }
         return "ok";
     }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PaymentManagementServiceImpl.java

@@ -21,6 +21,7 @@ import com.winsea.svc.base.security.entity.User;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.winsea.svc.base.workflow.entity.Workflow;
 import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.entity.view.ExportVView;
@@ -73,7 +74,8 @@ import java.util.stream.Collectors;
 @SofaService
 @Slf4j
 public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementMapper, PaymentManagement> implements IPaymentManagementService {
-
+    @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
     @Autowired
     private INewWorkflowService workflowService;
     @SofaReference
@@ -906,6 +908,18 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
             this.updateById(paymentManagement);
             workflowService.activateInstance(paymentManagement.getWorkflowId(), paymentManagement.getId());
         }
+
+
+        //  添加提交历史
+        CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+        commonBillOperateHis.setBillId(paymentManagement.getId());
+        commonBillOperateHis.setId(IdGenerator.generateUUID());
+        commonBillOperateHis.setBillType("PAYMENT-MANAGEMENT-APPROVE");
+        commonBillOperateHis.setOperateDate(new Date());
+        commonBillOperateHis.setOperateUser(paymentManagement.getCreateUserId());
+        JSONObject jsonObject = (JSONObject) JSONObject.toJSON(paymentManagement);
+        commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+        commonBillOperateHisService.create(commonBillOperateHis);
         return "OK";
     }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PurchaseClosingReportServiceImpl.java

@@ -10,6 +10,9 @@ import com.winsea.svc.base.base.service.ICommonRoleResourceService;
 import com.winsea.svc.base.security.entity.User;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.winsea.svc.base.workflow.entity.Workflow;
+import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
+import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.PurchaseClosingReport;
@@ -27,10 +30,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -46,7 +46,8 @@ public class PurchaseClosingReportServiceImpl extends ServiceImpl<PurchaseClosin
 
     @Autowired
     private INewWorkflowService workflowService;
-
+    @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
     @SofaReference
     private ICommonRoleResourceService roleResourceService;
     @Autowired
@@ -237,6 +238,16 @@ public class PurchaseClosingReportServiceImpl extends ServiceImpl<PurchaseClosin
                 this.updateById(purchaseClosingReport);
                 workflowService.activateInstance(purchaseClosingReport.getWorkflowId(), purchaseClosingReport.getId());
             }
+            //  添加提交历史
+            CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+            commonBillOperateHis.setBillId(purchaseClosingReport.getId());
+            commonBillOperateHis.setId(IdGenerator.generateUUID());
+            commonBillOperateHis.setBillType("PROCUREMENT-CLOSE-REPORT");
+            commonBillOperateHis.setOperateDate(new Date());
+            commonBillOperateHis.setOperateUser(purchaseClosingReport.getCreateUserId());
+            JSONObject jsonObject = (JSONObject) JSONObject.toJSON(purchaseClosingReport);
+            commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+            commonBillOperateHisService.create(commonBillOperateHis);
         }
         if (one) {
             return "OK";

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PurchaseOrderServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.winsea.svc.base.workflow.entity.Workflow;
 import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
 import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
@@ -58,6 +59,8 @@ public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, P
     @Autowired
     private INewWorkflowService workflowService;
     @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
+    @Autowired
     private GeTuiUtils geTuiUtils;
     @Autowired
     private IPurchaseReceiptReportService purchaseReceiptReportService;
@@ -220,6 +223,18 @@ public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, P
             purchaseClosingReportService.updateById(purchaseClosingReport);
             workflowService.activateInstance(purchaseClosingReport.getWorkflowId(), purchaseClosingReport.getId());
         }
+        //  添加提交历史
+        CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+        commonBillOperateHis.setBillId(purchaseClosingReport.getId());
+        commonBillOperateHis.setId(IdGenerator.generateUUID());
+        commonBillOperateHis.setBillType("PROCUREMENT-CLOSE-REPORT");
+        commonBillOperateHis.setOperateDate(new Date());
+        commonBillOperateHis.setOperateUser(purchaseClosingReport.getCreateUserId());
+        JSONObject jsonObject = (JSONObject) JSONObject.toJSON(purchaseClosingReport);
+        commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+        commonBillOperateHisService.create(commonBillOperateHis);
+
+
         if (one && two) {
             return "OK";
         } else {
@@ -639,6 +654,18 @@ public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, P
             this.updateById(purchaseOrder);
             workflowService.activateInstance(purchaseOrder.getWorkflowId(), purchaseOrder.getId());
         }
+
+        //  添加提交历史
+        CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+        commonBillOperateHis.setBillId(purchaseOrder.getId());
+        commonBillOperateHis.setId(IdGenerator.generateUUID());
+        commonBillOperateHis.setBillType("PROCUREMENT-ORDER-APPROVE");
+        commonBillOperateHis.setOperateDate(new Date());
+        commonBillOperateHis.setOperateUser(purchaseOrder.getCreateUserId());
+        JSONObject jsonObject = (JSONObject) JSONObject.toJSON(purchaseOrder);
+        commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+        commonBillOperateHisService.create(commonBillOperateHis);
+
         return "OK";
     }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PurchasePriceServiceImpl.java

@@ -15,6 +15,8 @@ import com.winsea.svc.base.workflow.entity.Workflow;
 import com.winsea.svc.notice.entity.base.BaseNotice;
 import com.winsea.svc.notice.service.INoticeService;
 import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
+import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.entity.view.TmpModel;
@@ -31,10 +33,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -57,6 +56,8 @@ public class PurchasePriceServiceImpl extends ServiceImpl<PurchasePriceMapper, P
     @Autowired
     private INewWorkflowService workflowService;
     @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
+    @Autowired
     private ICommonStaffService staffService;
     @Autowired
     private CacheComponent cacheComponent;
@@ -160,6 +161,17 @@ public class PurchasePriceServiceImpl extends ServiceImpl<PurchasePriceMapper, P
             this.updateById(purchasePrice);
             workflowService.activateInstance(purchasePrice.getWorkflowId(), purchasePrice.getId());
         }
+        //  添加提交历史
+        CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+        commonBillOperateHis.setBillId(purchasePrice.getId());
+        commonBillOperateHis.setId(IdGenerator.generateUUID());
+        commonBillOperateHis.setBillType("PROCUREMENT-PRICE-APPROVE");
+        commonBillOperateHis.setOperateDate(new Date());
+        commonBillOperateHis.setOperateUser(purchasePrice.getCreateUserId());
+        JSONObject jsonObject = (JSONObject) JSONObject.toJSON(purchasePrice);
+        commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+        commonBillOperateHisService.create(commonBillOperateHis);
+
         return "ok";
     }
 
@@ -260,6 +272,17 @@ public class PurchasePriceServiceImpl extends ServiceImpl<PurchasePriceMapper, P
                 this.updateById(purchasePrice);
                 workflowService.activateInstance(purchasePrice.getWorkflowId(), purchasePrice.getId());
             }
+        //  添加提交历史
+        CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+        commonBillOperateHis.setBillId(purchasePrice.getId());
+        commonBillOperateHis.setId(IdGenerator.generateUUID());
+        commonBillOperateHis.setBillType("PROCUREMENT-PRICE-APPROVE");
+        commonBillOperateHis.setOperateDate(new Date());
+        commonBillOperateHis.setOperateUser(purchasePrice.getCreateUserId());
+        JSONObject jsonObject = (JSONObject) JSONObject.toJSON(purchasePrice);
+        commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+        commonBillOperateHisService.create(commonBillOperateHis);
+
         return "ok";
     }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PurchaseReceiptReportServiceImpl.java

@@ -11,6 +11,8 @@ import com.winsea.svc.base.security.entity.User;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.winsea.svc.base.workflow.entity.Workflow;
 import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
+import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.exception.YException;
@@ -25,10 +27,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -44,7 +43,8 @@ public class PurchaseReceiptReportServiceImpl extends ServiceImpl<PurchaseReceip
 
     @Autowired
     private INewWorkflowService workflowService;
-
+    @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
     @SofaReference
     private ICommonRoleResourceService roleResourceService;
     @Autowired
@@ -146,6 +146,18 @@ public class PurchaseReceiptReportServiceImpl extends ServiceImpl<PurchaseReceip
                 this.updateById(purchaseReceiptReport1);
                 workflowService.activateInstance(purchaseReceiptReport1.getWorkflowId(), purchaseReceiptReport1.getId());
             }
+
+            //  添加提交历史
+            CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+            commonBillOperateHis.setBillId(purchaseReceiptReport1.getId());
+            commonBillOperateHis.setId(IdGenerator.generateUUID());
+            commonBillOperateHis.setBillType("PROCUREMENT-RECEIPT-REPORT");
+            commonBillOperateHis.setOperateDate(new Date());
+            commonBillOperateHis.setOperateUser(purchaseReceiptReport1.getCreateUserId());
+            JSONObject jsonObject = (JSONObject) JSONObject.toJSON(purchaseReceiptReport1);
+            commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+            commonBillOperateHisService.create(commonBillOperateHis);
+
         }
         if (one) {
             return "OK";

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/SaleOrderServiceImpl.java

@@ -8,6 +8,7 @@ import com.google.common.collect.Lists;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.winsea.svc.base.workflow.entity.Workflow;
 import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
 import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
@@ -58,6 +59,8 @@ public class SaleOrderServiceImpl extends ServiceImpl<SaleOrderMapper, SaleOrder
     @Autowired
     private INewWorkflowService workflowService;
     @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
+    @Autowired
     private GeTuiUtils geTuiUtils;
     @Autowired
     private ICustomerInfoService customerInfoService;
@@ -275,6 +278,18 @@ public class SaleOrderServiceImpl extends ServiceImpl<SaleOrderMapper, SaleOrder
             salesClosingReportService.updateById(salesClosingReport);
             workflowService.activateInstance(salesClosingReport.getWorkflowId(), salesClosingReport.getId());
         }
+
+        //  添加提交历史
+        CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+        commonBillOperateHis.setBillId(salesClosingReport.getId());
+        commonBillOperateHis.setId(IdGenerator.generateUUID());
+        commonBillOperateHis.setBillType("SALE-CLOSE-REPORT");
+        commonBillOperateHis.setOperateDate(new Date());
+        commonBillOperateHis.setOperateUser(salesClosingReport.getCreateUserId());
+        JSONObject jsonObject = (JSONObject) JSONObject.toJSON(salesClosingReport);
+        commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+        commonBillOperateHisService.create(commonBillOperateHis);
+
         if (one && two) {
             return "OK";
         } else {
@@ -527,6 +542,18 @@ public class SaleOrderServiceImpl extends ServiceImpl<SaleOrderMapper, SaleOrder
             workflowService.activateInstance(saleOrder.getWorkflowId(), saleOrder.getId());
         }
 
+        //  添加提交历史
+        CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+        commonBillOperateHis.setBillId(saleOrder.getId());
+        commonBillOperateHis.setId(IdGenerator.generateUUID());
+        commonBillOperateHis.setBillType("SALE-ORDER-APPROVE");
+        commonBillOperateHis.setOperateDate(new Date());
+        commonBillOperateHis.setOperateUser(saleOrder.getCreateUserId());
+        JSONObject jsonObject = (JSONObject) JSONObject.toJSON(saleOrder);
+        commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+        commonBillOperateHisService.create(commonBillOperateHis);
+
+
         // 添加客户信息
         int count = customerInfoService.selectCount(new EntityWrapper<CustomerInfo>().eq("customer_phone", saleOrder.getBuyerPhone())
                 .eq("customer_name",saleOrder.getBuyer())

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/SalesClosingReportServiceImpl.java

@@ -10,6 +10,9 @@ import com.winsea.svc.base.base.service.ICommonRoleResourceService;
 import com.winsea.svc.base.security.entity.User;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.winsea.svc.base.workflow.entity.Workflow;
+import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
+import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.SalesClosingReport;
@@ -28,10 +31,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -53,7 +53,8 @@ public class SalesClosingReportServiceImpl extends ServiceImpl<SalesClosingRepor
     @SofaReference
     private ICommonRoleResourceService roleResourceService;
 
-
+    @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
     /**
      * 销售平仓统计列表
      *
@@ -146,6 +147,17 @@ public class SalesClosingReportServiceImpl extends ServiceImpl<SalesClosingRepor
                 this.updateById(salesClosingReport);
                 workflowService.activateInstance(salesClosingReport.getWorkflowId(), salesClosingReport.getId());
             }
+
+            //  添加提交历史
+            CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+            commonBillOperateHis.setBillId(salesClosingReport.getId());
+            commonBillOperateHis.setId(IdGenerator.generateUUID());
+            commonBillOperateHis.setBillType("SALE-CLOSE-REPORT");
+            commonBillOperateHis.setOperateDate(new Date());
+            commonBillOperateHis.setOperateUser(salesClosingReport.getCreateUserId());
+            JSONObject jsonObject = (JSONObject) JSONObject.toJSON(salesClosingReport);
+            commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+            commonBillOperateHisService.create(commonBillOperateHis);
         }
         if (one) {
             return "OK";

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/SalesDeliveryReportServiceImpl.java

@@ -10,6 +10,9 @@ import com.winsea.svc.base.base.service.ICommonRoleResourceService;
 import com.winsea.svc.base.security.entity.User;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.winsea.svc.base.workflow.entity.Workflow;
+import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
+import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.exception.YException;
@@ -24,10 +27,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -42,6 +42,8 @@ import java.util.stream.Collectors;
 public class SalesDeliveryReportServiceImpl extends ServiceImpl<SalesDeliveryReportMapper, SalesDeliveryReport> implements ISalesDeliveryReportService {
     @Autowired
     private INewWorkflowService workflowService;
+    @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
     @SofaReference
     private ICommonRoleResourceService roleResourceService;
     @Autowired
@@ -226,6 +228,18 @@ public class SalesDeliveryReportServiceImpl extends ServiceImpl<SalesDeliveryRep
                 this.updateById(salesDeliveryReport);
                 workflowService.activateInstance(salesDeliveryReport.getWorkflowId(), salesDeliveryReport.getId());
             }
+
+            //  添加提交历史
+            CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+            commonBillOperateHis.setBillId(salesDeliveryReport.getId());
+            commonBillOperateHis.setId(IdGenerator.generateUUID());
+            commonBillOperateHis.setBillType("SALE-RECEIPT-REPORT");
+            commonBillOperateHis.setOperateDate(new Date());
+            commonBillOperateHis.setOperateUser(salesDeliveryReport.getCreateUserId());
+            JSONObject jsonObject = (JSONObject) JSONObject.toJSON(salesDeliveryReport);
+            commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+            commonBillOperateHisService.create(commonBillOperateHis);
+
         }
         if (one) {
             return "OK";

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ShortFillingInfoServiceImpl.java

@@ -2,11 +2,14 @@ package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
+import com.gexin.fastjson.JSONObject;
 import com.gexin.rp.sdk.base.uitls.StringUtils;
 import com.google.common.collect.Lists;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.winsea.svc.base.workflow.entity.Workflow;
 import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
+import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.FuelFillingInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.ShortFillingInfo;
@@ -45,7 +48,8 @@ public class ShortFillingInfoServiceImpl extends ServiceImpl<ShortFillingInfoMap
     private IFuelFillingInfoService fuelFillingInfoService;
     @Autowired
     private INewWorkflowService workflowService;
-
+    @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
     /**
      * 添加短途加油信息
      *
@@ -211,6 +215,18 @@ public class ShortFillingInfoServiceImpl extends ServiceImpl<ShortFillingInfoMap
             fuelFillingInfoService.updateById(fuelFillingInfo);
             workflowService.activateInstance(fuelFillingInfo.getWorkflowId(), fuelFillingInfo.getId());
         }
+
+        //  添加提交历史
+        CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+        commonBillOperateHis.setBillId(fuelFillingInfo.getId());
+        commonBillOperateHis.setId(IdGenerator.generateUUID());
+        commonBillOperateHis.setBillType("JIAYOU-SHENHE-APPROVE");
+        commonBillOperateHis.setOperateDate(new Date());
+        commonBillOperateHis.setOperateUser(fuelFillingInfo.getCreateUserId());
+        JSONObject jsonObject = (JSONObject) JSONObject.toJSON(fuelFillingInfo);
+        commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+        commonBillOperateHisService.create(commonBillOperateHis);
+
         return "OK";
     }
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TranProcessInfoServiceImpl.java

@@ -18,6 +18,7 @@ import com.winsea.svc.notice.service.INoticeService;
 import com.winsea.svc.notice.service.INoticeTaskService;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.common.support.util.StringUtils;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
 import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
@@ -62,6 +63,8 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
     @Autowired
     private IDriverPayeeInfoService driverPayeeInfoService;
     @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
+    @Autowired
     private INewWorkflowService workflowService;
     @Autowired
     private INoticeService noticeService;
@@ -972,6 +975,18 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                     workflowService.startInstance(workflow.getId(), tranProcessInfo1.getId());
                 }
             }
+
+            //  添加提交历史
+            CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+            commonBillOperateHis.setBillId(tranProcessInfo1.getId());
+            commonBillOperateHis.setId(IdGenerator.generateUUID());
+            commonBillOperateHis.setBillType("YUNJIA-TRAN-APPROVE");
+            commonBillOperateHis.setOperateDate(new Date());
+            commonBillOperateHis.setOperateUser(tranProcessInfo1.getCreateUserId());
+            JSONObject jsonObject = (JSONObject) JSONObject.toJSON(tranProcessInfo1);
+            commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+            commonBillOperateHisService.create(commonBillOperateHis);
+
         }
         this.updateById(tranProcessInfo);
         return "ok";
@@ -1003,6 +1018,18 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                     this.updateById(tranProcessInfo1);
                     workflowService.startInstance(workflow.getId(), tranProcessInfo1.getId());
                 }
+
+                //  添加提交历史
+                CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+                commonBillOperateHis.setBillId(tranProcessInfo1.getId());
+                commonBillOperateHis.setId(IdGenerator.generateUUID());
+                commonBillOperateHis.setBillType("YUNJIA-TRAN-APPROVE");
+                commonBillOperateHis.setOperateDate(new Date());
+                commonBillOperateHis.setOperateUser(tranProcessInfo1.getCreateUserId());
+                JSONObject jsonObject = (JSONObject) JSONObject.toJSON(tranProcessInfo1);
+                commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+                commonBillOperateHisService.create(commonBillOperateHis);
+
             }
         }
         this.updateById(tranProcessInfo);

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TranSettlementReportServiceImpl.java

@@ -15,6 +15,8 @@ import com.winsea.svc.base.security.entity.User;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.winsea.svc.base.workflow.entity.Workflow;
 import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
+import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.*;
@@ -61,7 +63,8 @@ import java.util.stream.Collectors;
 @Service
 @Slf4j
 public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementReportMapper, TranSettlementReport> implements ITranSettlementReportService {
-
+    @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
     @Autowired
     private INewWorkflowService workflowService;
     @SofaReference
@@ -686,6 +689,18 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
                 batchReviewInfoService.updateById(batchReviewInfo);
                 workflowService.startInstance(workflow.getId(), batchReviewInfo.getId());
             }
+
+            //  添加提交历史
+            CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+            commonBillOperateHis.setBillId(batchReviewInfo.getId());
+            commonBillOperateHis.setId(IdGenerator.generateUUID());
+            commonBillOperateHis.setBillType("TRANSPORTATION-SETTLEMENT-REPORT");
+            commonBillOperateHis.setOperateDate(new Date());
+            commonBillOperateHis.setOperateUser(batchReviewInfo.getCreateUserId());
+            JSONObject jsonObject = (JSONObject) JSONObject.toJSON(tranSettlementReportList);
+            commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+            commonBillOperateHisService.create(commonBillOperateHis);
+
         }
         //  更新详细状态
         batchReviewInfo = batchReviewInfoService.selectById(batchReviewInfo.getId());

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehousingOrderServiceImpl.java

@@ -15,6 +15,7 @@ import com.winsea.svc.notice.entity.NoticeTaskInfo;
 import com.winsea.svc.notice.entity.base.BaseNotice;
 import com.winsea.svc.notice.service.INoticeService;
 import com.winsea.svc.notice.service.INoticeTaskService;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
 import com.yh.saas.plugin.yiliangyiyun.entity.InOutWarehouseTask;
 import com.yh.saas.plugin.yiliangyiyun.entity.PaymentManagement;
 import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInOutInfo;
@@ -93,6 +94,8 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
     private ICommonSysParameterService commonSysParameterService;
     @Autowired
     private INewWorkflowService workflowService;
+    @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
     @SofaReference
     private ICommonRoleResourceService roleResourceService;
     @Autowired
@@ -1093,6 +1096,18 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                         }
                         workflowService.activateInstance(warehousingOrder1.getWorkflowId(), warehousingOrder1.getBatchId());
                     }
+
+                    //  添加提交历史
+                    CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+                    commonBillOperateHis.setBillId(warehousingOrder1.getBatchId());
+                    commonBillOperateHis.setId(IdGenerator.generateUUID());
+                    commonBillOperateHis.setBillType("WAREHOUSING-ORDER-APPROVE");
+                    commonBillOperateHis.setOperateDate(new Date());
+                    commonBillOperateHis.setOperateUser(warehousingOrder1.getCreateUserId());
+                    JSONObject jsonObject = (JSONObject) JSONObject.toJSON(warehousingOrderList);
+                    commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+                    commonBillOperateHisService.create(commonBillOperateHis);
+
                 }
             }
         }