1.新增接口updateOrderBaseInfo更新资产订单基本信息

2.修改接口updatePrincipalAndMembers可以更新接单部门

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

@@ -219,5 +219,15 @@ public class AssetsController extends BaseController {
         Assets assets = assetsService.detail(id);
         return RestResponse.data(assets);
     }
+
+    /**
+     * 更新资产订单基本信息
+     * @param assets 信息
+     * @return RestResponse<Boolean>
+     */
+    @PutMapping("/updateOrderBaseInfo")
+    public RestResponse<Boolean> updateOrderBaseInfo(@RequestBody Assets assets) {
+        return RestResponse.data(assetsService.updateOrderBaseInfo(assets));
+    }
 }
 

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

@@ -128,4 +128,11 @@ public interface AssetsMapper extends CustomBaseMapper<Assets> {
      * @return AssetsBusinessMember
      */
     AssetsBusinessMember getAssetsBusinessMember(@Param("userId") Long userId);
+
+    /**
+     * 更新资产订单基本信息
+     * @param assets 更新信息
+     * @return Boolean
+     */
+    Boolean updateOrderBaseInfo(@Param("assets") Assets assets);
 }

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

@@ -677,4 +677,23 @@
         AND id = #{userId}
     </select>
 
+    <!--更新资产订单基本信息-->
+    <update id="updateOrderBaseInfo">
+        UPDATE assets
+        SET name = #{assets.name},
+            assets_business_gener = #{assets.assetsBusinessGener},
+            entrust_again = #{assets.entrustAgain},
+            security = #{assets.security},
+            significant_assets_reorganization = #{assets.significantAssetsReorganization},
+            state_assets = #{assets.stateAssets},
+            foreign_assets_involved = #{assets.foreignAssetsInvolved},
+            dispense_benefit = #{assets.dispenseBenefit},
+            bailor = #{assets.bailor},
+            bailor_address = #{assets.bailorAddress},
+            bailor_contact_name = #{assets.bailorContactName},
+            bailor_contact_tel = #{assets.bailorContactTel}
+        WHERE id = #{assets.id}
+        AND deleted = 0
+    </update>
+
 </mapper>

domain/src/main/java/com/dayou/dto/AssetsPrincipalMembersDTO.java

@@ -11,6 +11,11 @@ import lombok.Data;
 public class AssetsPrincipalMembersDTO extends BaseEntity {
 
     /**
+     * 接单部门id
+     */
+    private Long departmentId;
+
+    /**
      * 项目负责人id(user_id)
      */
     private Long principalId;

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

@@ -131,4 +131,11 @@ public interface IAssetsService extends IService<Assets> {
          */
         Assets detail(Long id);
 
+        /**
+         * 更新资产订单基本信息
+         * @param assets 更新信息
+         * @return Boolean
+         */
+        Boolean updateOrderBaseInfo(Assets assets);
+
 }

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

@@ -206,7 +206,10 @@ public class AssetsServiceImpl extends ServiceImpl<AssetsMapper, Assets> impleme
         if (ObjectUtil.isNull(assetsPrincipalMembersDTO.getPrincipalId()) && ObjectUtil.isNull(assetsPrincipalMembersDTO.getMembers())) {
             ErrorCode.throwBusinessException(ErrorCode.CUSTOM_ERROR, "项目负责人和项目参与人员不能为空。");
         }
-        return this.update(new LambdaUpdateWrapper<Assets>().set(Assets::getMembers, assetsPrincipalMembersDTO.getMembers()).set(Assets::getPrincipalId, assetsPrincipalMembersDTO.getPrincipalId())
+        return this.update(new LambdaUpdateWrapper<Assets>()
+                .set(Assets::getMembers, assetsPrincipalMembersDTO.getMembers())
+                .set(Assets::getPrincipalId, assetsPrincipalMembersDTO.getPrincipalId())
+                .set(Assets::getDepartmentId, assetsPrincipalMembersDTO.getDepartmentId())
                 .eq(BaseEntity::getId, assetsPrincipalMembersDTO.getId()));
     }
 
@@ -609,6 +612,16 @@ public class AssetsServiceImpl extends ServiceImpl<AssetsMapper, Assets> impleme
     }
 
     /**
+     * 更新资产订单基本信息
+     * @param assets 更新信息
+     * @return Boolean
+     */
+    @Override
+    public Boolean updateOrderBaseInfo(Assets assets) {
+        return assetsMapper.updateOrderBaseInfo(assets);
+    }
+
+    /**
      * 获取资产轮单部门id
      *
      * @return Long