1.修复资产流程处理人为部门领导空指针BUG

2.新增资产-我的订单-编辑 功能

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

@@ -213,5 +213,11 @@ public class AssetsController extends BaseController {
     public RestResponse<List<AssetsBusinessMember>> getAssetsBusinessMembers(AssetsBusinessMembersDTO assetsBusinessMembersDTO) throws JsonProcessingException {
         return RestResponse.data(assetsService.getAssetsBusinessMembers(assetsBusinessMembersDTO));
     }
+
+    @GetMapping("/detail/{id}")
+    public RestResponse<Assets> detail(@PathVariable Long id) {
+        Assets assets = assetsService.detail(id);
+        return RestResponse.data(assets);
+    }
 }
 

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

@@ -567,6 +567,7 @@
         assets.entrust_again,
         assets.clientele_type,
         assets.principal_id,
+        assets.terminal_clientele_contact_id AS terminalClienteleContactId,
         customer.id AS clienteleId,
         customer.name AS customerName,
         linkman.id AS clienteleContactId,

domain/src/main/java/com/dayou/entity/Assets.java

@@ -1,4 +1,6 @@
 package com.dayou.entity;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.dayou.common.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -80,11 +82,13 @@ public class Assets extends BaseEntity {
     /**
      * 客户id
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Long clienteleId;
 
     /**
      * 业务来源（下级客户id）
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Long clienteleSubId;
 
     /**
@@ -158,6 +162,7 @@ public class Assets extends BaseEntity {
     /**
      * 终端客户id
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Long terminalClienteleId;
 
     /**
@@ -170,6 +175,7 @@ public class Assets extends BaseEntity {
     /**
      * 终端联系人
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Long terminalClienteleContactId;
 
     /**

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

@@ -124,4 +124,11 @@ public interface IAssetsService extends IService<Assets> {
          */
         Boolean doAllotRealAmountToOrder(List<OrderReportDTO> claimOrders);
 
+        /**
+         * 获取订单详情
+         * @param id 订单id
+         * @return Assets
+         */
+        Assets detail(Long id);
+
 }

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

@@ -223,6 +223,15 @@ public class AssetsServiceImpl extends ServiceImpl<AssetsMapper, Assets> impleme
 
     @Override
     public Boolean update(Assets assets) {
+        if (assets.getClienteleType().equals("个人")){
+            assets.setClienteleId(null);
+            assets.setClienteleSubId(null);
+        }
+        if (assets.getTerminalClienteleType().equals("个人")){
+            assets.setTerminalClienteleId(null);
+        }else {
+            assets.setTerminalClienteleContactId(null);
+        }
         return this.updateById(assets);
     }
 
@@ -590,6 +599,16 @@ public class AssetsServiceImpl extends ServiceImpl<AssetsMapper, Assets> impleme
     }
 
     /**
+     * 获取订单详情
+     * @param id 订单id
+     * @return Assets
+     */
+    @Override
+    public Assets detail(Long id) {
+        return this.getById(id);
+    }
+
+    /**
      * 获取资产轮单部门id
      *
      * @return Long

service/src/main/java/com/dayou/workflow/handler/AssetsNodeHandler.java

@@ -168,7 +168,7 @@ public class AssetsNodeHandler extends WorkNodeProcessable {
     @Override
     public Long searchHandlerId(WorkFlowNodeInstance instanceNode, HandlerPermissionDTO handlerPermissionDTO) {
         HandlerPermissionEnum handlerPermissionEnum = handlerPermissionDTO.getName();
-        Assets assets = assetsMapper.selectOne(new LambdaQueryWrapper<Assets>().select(Assets::getClientManagerId, Assets::getPrincipalId)
+        Assets assets = assetsMapper.selectOne(new LambdaQueryWrapper<Assets>().select(Assets::getClientManagerId, Assets::getPrincipalId, Assets::getDepartmentId)
                 .eq(BaseEntity::getId, instanceNode.getBusinessId()));
         switch (handlerPermissionEnum) {
             case EMPLOYEE: