1.新增表business_performance_distribution

2.节点报告出库申请、报告出库部门审核、报告出库开发
3.归档审核与复审部归档审核开发(开发中)
4.资产列表查询修改

biz-base/src/main/resources/application-local.yml

@@ -19,12 +19,12 @@ spring:
 
 
 dfs:
-  path: G:\upload
-  domain: G:\upload
+  path: E:\upload
+  domain: E:\upload
   domainName: https://kps.scdayou.com/dfs
-  code: G:\code
+  code: E:\code
   domainRoot: localhost
-  luceneDir: G:\luceneIndex
+  luceneDir: E:\luceneIndex
 
 advice:
   file:

dao/src/main/resources/mapper/AssetsMapper.xml

@@ -71,7 +71,9 @@
         nodeInfo.businessId,
         nodeInfo.currentNodeName,
         nodeInfo.currentNodeCode,
-        nodeInfo.handlerName
+        nodeInfo.handlerName,
+        nodeInfo.currentNodeId,
+        nodeInfo.recordId
         FROM (SELECT @i := 0) AS sort,assets
         LEFT JOIN user ON user.id = assets.principal_id
         LEFT JOIN customer_company AS customer ON customer.id = assets.clientele_id
@@ -82,7 +84,8 @@
         node.code AS currentNodeCode,
         nodeInstance.business_id AS businessId,
         nodeInstance.business_sub_id,
-        nodeInstance.business_min_id
+        nodeInstance.business_min_id,
+        record.id AS recordId
         FROM work_flow_node_instance AS nodeInstance,
         work_task_record AS record,
         user,
@@ -130,7 +133,9 @@
         assets.order_id,
         assets_business_gener,
         allot_type,
-        production.production_no,
+        (SELECT production_no FROM assets_production WHERE assets_production.production_no = nodeInfo.business_sub_id) AS statementNo,
+        (SELECT production_no FROM assets_production WHERE assets_production.production_no = nodeInfo.business_min_id) AS reportNo,
+        (SELECT production_type FROM assets_production WHERE assets_production.production_no = nodeInfo.business_sub_id) AS productionType,
         clientele_id,
         customer.name AS customerName,
         bailor,
@@ -154,12 +159,13 @@
         nodeInfo.currentNodeName,
         nodeInfo.currentNodeCode,
         nodeInfo.handlerName,
-        production.production_type
+        nodeInfo.recordId,
+        nodeInfo.currentNodeId,
+        warehouse.id AS warehouseId
         FROM (SELECT @i := 0) AS sort,assets
-        LEFT JOIN assets_production AS production ON production.business_id = assets.id
         LEFT JOIN user ON user.id = assets.principal_id
         LEFT JOIN customer_company AS customer ON customer.id = assets.clientele_id
-        LEFT JOIN order_fund AS fund ON fund.business_id = assets.id
+        LEFT JOIN order_fund AS fund ON fund.business_id = assets.id AND business_type = 'ASSET_BUSINESS'
         LEFT JOIN production_fund AS pFund ON pFund.business_id = assets.id
         LEFT JOIN finance_invoice AS invoice ON pFund.order_fund_id = fund.id
         #查询当前进行的节点信息
@@ -167,7 +173,10 @@
         user.name AS handlerName,
         node.name AS currentNodeName,
         node.code AS currentNodeCode,
-        nodeInstance.business_id AS businessId
+        nodeInstance.business_id AS businessId,
+        nodeInstance.business_sub_id,
+        nodeInstance.business_min_id,
+        record.id AS recordId
         FROM work_flow_node_instance AS nodeInstance,
         work_task_record AS record,
         user,
@@ -178,6 +187,7 @@
         AND nodeInstance.deleted = 0
         AND record.instance_id = nodeInstance.id
         ) AS nodeInfo ON nodeInfo.businessId = assets.id
+        LEFT JOIN production_out_warehouse AS warehouse ON warehouse.report_no = nodeInfo.business_min_id AND warehouse.deleted = 0
         WHERE assets.deleted = 0
         AND assets.client_manager_id = #{assetsSelectDTO.clientManagerId}
         #送达状态查询

domain/src/main/java/com/dayou/vo/AssetsVO.java

@@ -146,7 +146,17 @@ public class AssetsVO extends Assets {
     private String productionType;
 
     /**
-     *
+     * 订单收款id
      */
     private Long orderFundId;
+
+    /**
+     * 任务id
+     */
+    private Long recordId;
+
+    /**
+     * 报告出库申请id
+     */
+    private Long warehouseId;
 }

service/src/main/java/com/dayou/service/impl/AssetsProductionServiceImpl.java

@@ -136,7 +136,7 @@ public class AssetsProductionServiceImpl extends ServiceImpl<AssetsProductionMap
 //                .eq(AssetsProduction::getProductionNo, assetsProduction.getProductionNo())
 //                .eq(AssetsProduction::getId, assetsProduction.getId()));
 //        if (ObjectUtil.isNotNull(productionType) && !productionType.getProductionType().equals("STATEMENT")){
-            addAssetsShouldAmount(assetsProduction);
+//            addAssetsShouldAmount(assetsProduction);
 //        }
         return assetsProductionMapper.writeAssetsProduction(assetsProduction);
     }
@@ -223,12 +223,14 @@ public class AssetsProductionServiceImpl extends ServiceImpl<AssetsProductionMap
                         .eq(OrderFund::getBusinessType, ASSET_BUSINESS.getCode()));
                 // 非意见书,且实收款未认领(订单实收款为NULL)
                 if (!assetsProduction.getProductionType().equals(STATEMENT.name()) && ObjectUtil.isNull(orderFund)) {
-                    ProductionOutWarehouse productionOutWarehouse = productionOutWarehouseService.getOne(new LambdaQueryWrapper<ProductionOutWarehouse>()
-                            .select(BaseEntity::getId, ProductionOutWarehouse::getDepartmentCheckState)
-                            .eq(ProductionOutWarehouse::getProductionId, wareHouseDTO.getProductionId())
-                            .eq(ProductionOutWarehouse::getReportNo, wareHouseDTO.getProductionNo()));
+                    int passCount = productionOutWarehouseService.count(new LambdaQueryWrapper<ProductionOutWarehouse>()
+                            .select(ProductionOutWarehouse::getDepartmentCheckState)
+                            .eq(ProductionOutWarehouse::getReportNo, wareHouseDTO.getProductionNo())
+                            .eq(ProductionOutWarehouse::getBusinessType, "ASSET_BUSINESS")
+                            .eq(ProductionOutWarehouse::getDepartmentCheckState, "审核通过")
+                            .eq(BaseEntity::getDeleted, 0));
                     // 判断出库审核是否通过
-                    if (ObjectUtil.isNull(productionOutWarehouse) && !productionOutWarehouse.getDepartmentCheckState().equals("审核通过")) { // 不通过提示
+                    if (passCount < 1) { // 不通过提示
                         ErrorCode.throwBusinessException(ErrorCode.CUSTOM_ERROR, "不满足出库条件，该产品需客户经理申请产品出库通过后方可出库。");
                     } else { // 通过则出库
                         return this.update(new LambdaUpdateWrapper<AssetsProduction>()
@@ -279,9 +281,10 @@ public class AssetsProductionServiceImpl extends ServiceImpl<AssetsProductionMap
 
     /**
      * 新增订单收款信息
+     *
      * @param assetsProduction 资产订单信息
      */
-    public void addAssetsShouldAmount(AssetsProduction assetsProduction){
+    public void addAssetsShouldAmount(AssetsProduction assetsProduction) {
         // 从订单收款表获取应收款信息
         OrderFund orderFund = new OrderFund();
         orderFund = orderFundService.getOne(new LambdaQueryWrapper<OrderFund>()

service/src/main/java/com/dayou/service/impl/ProductionOutWarehouseServiceImpl.java

@@ -38,6 +38,7 @@ import java.util.ArrayList;
 import org.springframework.transaction.annotation.Transactional;
 import com.dayou.enums.BatchTaskTypeEnum;
 
+import static com.dayou.enums.MainBusinessEnum.ASSET_BUSINESS;
 import static com.dayou.enums.MainBusinessEnum.PERSONAL_BUSINESS;
 
 /**
@@ -115,6 +116,12 @@ public class ProductionOutWarehouseServiceImpl extends ServiceImpl<ProductionOut
             //获取财务审核人
             return  this.save(productionOutWarehouse);
         }
+        // 资产出库申请
+        if (productionOutWarehouse.getBusinessType().equals(ASSET_BUSINESS.name())){
+            productionOutWarehouse.setApplyId(LoginContext.getCurrentUserId());
+//            productionOutWarehouse.setDepartmentCheckState("审核中");
+            return this.save(productionOutWarehouse);
+        }
         ErrorCode.throwBusinessException(ErrorCode.CUSTOM_ERROR,"产品不在库存中，还未入库或则已经出库。请确认。");
         return Boolean.FALSE;
     }

sql/update_sql.sql

@@ -316,4 +316,24 @@ CREATE TABLE `work_record_transfer` (
   修改人:苟耕铨
  */
 # 业务产品收款表新增字段
-ALTER TABLE production_fund ADD COLUMN production_should_amount DECIMAL(16,2) NULL COMMENT '产品应收款';
+ALTER TABLE production_fund ADD COLUMN production_should_amount DECIMAL(16,2) NULL COMMENT '产品应收款';
+
+/**
+  日期：2024-05-08
+  修改人:苟耕铨
+ */
+# 新增绩效分配比例信息表
+DROP TABLE IF EXISTS `business_performance_distribution`;
+CREATE TABLE `business_performance_distribution`  (
+    `id` bigint(20) NOT NULL COMMENT '绩效分配表自增id',
+    `business_id` bigint(20) NOT NULL COMMENT '业务id',
+    `business_type` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '业务类型',
+    `report_no` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '报告产品号',
+    `performance_distribution` json NOT NULL COMMENT '每人比例信息(JSON数组)',
+    `created` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '创建时间',
+    `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '逻辑删除标识:1:删除 0:未删除',
+    `modified` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6) COMMENT '修改时间',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '绩效分配比例信息' ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;