修复bpm模块

tz-module-bpm/tz-module-bpm-biz/pom.xml

@@ -118,6 +118,13 @@
             <version>2.4.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+
+        <dependency>
+            <groupId>cn.tz.cloud</groupId>
+            <artifactId>tz-module-pressure2-api</artifactId>
+            <version>2.4.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

tz-module-bpm/tz-module-bpm-biz/src/main/java/cn/start/tz/module/bpm/convert/definition/BpmProcessDefinitionConvert.java

@@ -93,7 +93,9 @@ public interface BpmProcessDefinitionConvert {
         return respVO;
     }
 
-    @Mapping(source = "from.id", target = "to.id", ignore = true)
-    void copyTo(BpmProcessDefinitionInfoDO from, @MappingTarget BpmProcessDefinitionRespVO to);
+//    @Mapping(source = "from.id", target = "to.id", ignore = true)
+    default void copyTo(BpmProcessDefinitionInfoDO from, @MappingTarget BpmProcessDefinitionRespVO to){
+        to.setId(from.getId());
+    }
 
 }

tz-module-bpm/tz-module-bpm-biz/src/main/java/cn/start/tz/module/bpm/convert/task/BpmProcessInstanceConvert.java

@@ -103,8 +103,10 @@ public interface BpmProcessInstanceConvert {
         return respVO;
     }
 
-    @Mapping(source = "from.id", target = "to.id", ignore = true)
-    void copyTo(BpmProcessDefinitionInfoDO from, @MappingTarget BpmProcessDefinitionRespVO to);
+//    @Mapping(source = "from.id", target = "to.id", ignore = true)
+    default void copyTo(BpmProcessDefinitionInfoDO from, @MappingTarget BpmProcessDefinitionRespVO to){
+        to.setId(from.getId());
+    }
 
     default BpmProcessInstanceStatusEvent buildProcessInstanceStatusEvent(Object source, ProcessInstance instance, Integer status, String reason) {
         return new BpmProcessInstanceStatusEvent(source).setId(instance.getId()).setStatus(status).setReason(reason)

tz-module-bpm/tz-module-bpm-biz/src/main/java/cn/start/tz/module/bpm/framework/rpc/config/RpcConfiguration.java

@@ -5,6 +5,11 @@ import cn.start.tz.module.pressure.api.appointmentconfirmorderrefuseitem.Appoint
 import cn.start.tz.module.pressure.api.reporttemplate.ReportTemplateApi;
 import cn.start.tz.module.pressure.api.taskorder.TaskOrderApi;
 import cn.start.tz.module.pressure.api.taskordernontaxrecord.TaskOrderNonTaxRecordApi;
+import cn.start.tz.module.pressure2.api.acceptorder.BoilerAcceptOrderApi;
+import cn.start.tz.module.pressure2.api.acceptorder.PipeAcceptOrderApi;
+import cn.start.tz.module.pressure2.api.dynamictb.DynamicTbApi;
+import cn.start.tz.module.pressure2.api.taskorder.BoilerTaskOrderApi;
+import cn.start.tz.module.pressure2.api.taskorder.PipeTaskOrderApi;
 import cn.start.tz.module.system.api.dept.DeptApi;
 import cn.start.tz.module.system.api.dept.PostApi;
 import cn.start.tz.module.system.api.dict.DictDataApi;
@@ -19,6 +24,8 @@ import org.springframework.context.annotation.Configuration;
     // pressure模块
         AcceptOrderApi.class, AppointmentConfirmOrderRefuseItemApi.class, TaskOrderApi.class, ReportTemplateApi.class,
         TaskOrderNonTaxRecordApi.class
+        // pressure2模块
+        ,DynamicTbApi.class, BoilerTaskOrderApi.class, BoilerAcceptOrderApi.class, PipeTaskOrderApi.class, PipeAcceptOrderApi.class
 })
 public class RpcConfiguration {
 }