1.我的订单查询修改

2.修复资产业务，咨询报告流程的流程图渲染异常的BUG
3.新增产品标记送达
4.修改入库统计查询

biz-base/src/main/java/com/dayou/controller/AssetsProductionController.java

@@ -204,5 +204,15 @@ public class AssetsProductionController extends BaseController {
         return RestResponse.data(assetsProductionService.getProductionRealAmount(productionNo));
     }
 
+    /**
+     * 产品标记送达
+     * @param productionNo 产品号
+     * @return Boolean
+     */
+    @PutMapping("/markDelivery/{productionNo}")
+    public RestResponse<Boolean> markDelivery(@PathVariable String productionNo) {
+        return RestResponse.data(assetsProductionService.markDelivery(productionNo));
+    }
+
 }
 

dao/src/main/java/com/dayou/mapper/AssetsProductionMapper.java

@@ -97,4 +97,11 @@ public interface AssetsProductionMapper extends CustomBaseMapper<AssetsProductio
      * @return BigDecimal
      */
     BigDecimal getProductionRealAmount(@Param("productionNo") String productionNo);
+
+    /**
+     * 产品标记送达
+     * @param productionNo 产品号
+     * @return Boolean
+     */
+    Boolean markDelivery(@Param("productionNo") String productionNo);
 }

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

@@ -140,8 +140,10 @@
         assets_business_gener,
         allot_type,
         (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,
+        reportInfo.production_no AS reportNo,
+        reportInfo.repertory_state AS reportRepertoryState,
+        reportInfo.delivery AS reportDelivery,
         clientele_id,
         customer.name AS customerName,
         bailor,
@@ -174,8 +176,7 @@
         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 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
+        LEFT JOIN finance_invoice AS invoice ON invoice.order_fund_id = fund.id
         #查询当前进行的节点信息
         LEFT JOIN (SELECT nodeInstance.id AS currentNodeId,
         user.name AS handlerName,
@@ -196,6 +197,8 @@
         AND nodeInstance.deleted = 0
         AND record.instance_id = nodeInstance.id
         ) AS nodeInfo ON nodeInfo.businessId = assets.id
+        LEFT JOIN production_fund AS pFund ON pFund.order_fund_id = fund.id AND pFund.production_no = nodeInfo.business_min_id
+        LEFT JOIN(SELECT production_no,repertory_state,production_type,delivery FROM assets_production) AS reportInfo ON reportInfo.production_no = nodeInfo.business_min_id
         WHERE assets.deleted = 0
         AND assets.client_manager_id = #{assetsSelectDTO.clientManagerId}
         #送达状态查询
@@ -425,9 +428,9 @@
         (SELECT user.name FROM user WHERE user.id = assets.principal_id) AS principalName,
         (SELECT user.name FROM user WHERE user.id = assets.principal_id) AS firstReporter,
         (SELECT user.name FROM user WHERE user.id = assets.client_manager_id) AS managerName,
-        (SELECT customer.name
-        FROM customer
-        WHERE customer.id = assets.clientele_id) AS customerName,
+        (SELECT customer_company.name
+        FROM customer_company
+        WHERE customer_company.id = assets.clientele_id) AS customerName,
         (SELECT customer_company.name
         FROM customer_company
         WHERE customer_company.id = clientele_sub_id) AS customerSubName,
@@ -504,9 +507,9 @@
         (SELECT user.name FROM user WHERE user.id = assets.principal_id) AS principalName,
         (SELECT user.name FROM user WHERE user.id = assets.principal_id) AS firstReporter,
         (SELECT user.name FROM user WHERE user.id = assets.client_manager_id) AS managerName,
-        (SELECT customer.name
-        FROM customer
-        WHERE customer.id = assets.clientele_id) AS customerName,
+        (SELECT customer_company.name
+        FROM customer_company
+        WHERE customer_company.id = assets.clientele_id) AS customerName,
         (SELECT customer_company.name
         FROM customer_company
         WHERE customer_company.id = clientele_sub_id) AS customerSubName,

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

@@ -177,4 +177,13 @@
         AND deleted = 0
     </select>
 
+    <!--产品标记送达-->
+    <update id="markDelivery">
+        UPDATE assets_production
+        SET delivery = 1
+        WHERE production_no = #{productionNo}
+          AND deleted = 0
+    </update>
+
+
 </mapper>

domain/src/main/java/com/dayou/enums/workflow/CallbackEnum.java

@@ -133,9 +133,9 @@ public enum CallbackEnum {
 
             //咨询报告在校验产品类型时节点
             NecessaryNode consult = new NecessaryNode();
-            report.setProduction(ProductionEnum.CONSULT);
+            consult.setProduction(ProductionEnum.CONSULT);
             WorkflowNodeEnum[] consultWorkflowNodeEnums = {ASSET_REPORT_TAKE_NO,WRITE_REPORT, CHECK_REPORT,RECHECK_REPORT,FOURTH_CHECK_REPORT,REPORT_BOOKBINDING_STAMP,REPORT_IN,REPORT_OUT_APPLY,REPORT_OUT_DEPARTMENT_CHECK,REPORT_OUT,CHECK_ARCHIVING,RECHECK_ARCHIVING,BUSINESS_ARCHIVING};
-            report.setNecessaryNodes(consultWorkflowNodeEnums);
+            consult.setNecessaryNodes(consultWorkflowNodeEnums);
             this.necessaryNodes.add(consult);
 
             //复评函在校验产品类型时的节点

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

@@ -174,4 +174,14 @@ public class AssetsVO extends Assets {
      * 审核意见
      */
     private String comment;
+
+    /**
+     * 报告库存状态
+     */
+    private Boolean reportRepertoryState;
+
+    /**
+     * 报告送达状态
+     */
+    private Boolean reportDelivery;
 }

service/src/main/java/com/dayou/service/IAssetsProductionService.java

@@ -106,4 +106,11 @@ public interface IAssetsProductionService extends IService<AssetsProduction> {
          */
         BigDecimal getProductionRealAmount(String productionNo);
 
+        /**
+         * 产品标记送达
+         * @param productionNo 产品号
+         * @return Boolean
+         */
+        Boolean markDelivery(String productionNo);
+
 }

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

@@ -280,6 +280,16 @@ public class AssetsProductionServiceImpl extends ServiceImpl<AssetsProductionMap
     }
 
     /**
+     * 产品标记送达
+     * @param productionNo 产品号
+     * @return Boolean
+     */
+    @Override
+    public Boolean markDelivery(String productionNo) {
+        return assetsProductionMapper.markDelivery(productionNo);
+    }
+
+    /**
      * 新增订单收款信息
      *
      * @param assetsProduction 资产订单信息