Merge remote-tracking branch 'origin/master'

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

@@ -287,6 +287,7 @@
         AND record.handler_id = user.id
         AND nodeInstance.deleted = 0
         AND record.instance_id = nodeInstance.id
+        AND nodeInstance.business_type = 'ASSET_BUSINESS'
         ) AS nodeInfo ON nodeInfo.businessId = assets.id
         WHERE assets.deleted = 0
         AND nodeInfo.currentNodeCode = 'BUSINESS_ARCHIVING'

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

@@ -99,7 +99,8 @@
             create_production_date = #{createProductionDate},
             comment = #{comment},
             file_path = #{filePath},
-            assets_name = #{assetsName}
+            assets_name = #{assetsName},
+            qr_code = #{qrCode}
         WHERE production_no = #{productionNo}
           AND business_id = #{businessId}
     </update>

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

@@ -181,7 +181,6 @@ public class AssetsNodeHandler extends WorkNodeProcessable {
             case DEPARTMENT_LEADER:
                 return departmentMapper.selectOne(new LambdaQueryWrapper<Department>().select(Department::getLeaderId).eq(BaseEntity::getId, assets.getDepartmentId())).getLeaderId();
             case CLIENT_MANAGER:
-                return assets.getClientManagerId();
             case INITIATOR:
                 return assets.getClientManagerId();
             case PRINCIPAL:

sql/update_sql.sql

@@ -483,4 +483,11 @@ ALTER TABLE major_production ADD COLUMN delivery_date datetime(0) NULL COMMENT '
   修改人:苟耕铨
  */
 # 表business_performance_distribution修改字段
-ALTER TABLE business_performance_distribution MODIFY COLUMN report_no VARCHAR(128) NULL COMMENT '报告产品号';
+ALTER TABLE business_performance_distribution MODIFY COLUMN report_no VARCHAR(128) NULL COMMENT '报告产品号';
+
+/**
+  日期：2024-05-31
+  修改人:苟耕铨
+ */
+# 表assets_evaluation_target修改字段file_path
+ALTER TABLE assets_evaluation_target MODIFY COLUMN file_path JSON NULL COMMENT '附件资料路由信息(json)';