Merge remote-tracking branch 'origin/test' into test

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentMainPageReqVO.java

@@ -86,4 +86,6 @@ public class ReportDocumentMainPageReqVO extends PageParam {
     @Schema(description = "报表类型ID")
     private Long configReportTypeId;
 
+    @Schema(description = "表单设计器模板id")
+    private Long dataTemplateId;
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentMainRespVO.java

@@ -110,4 +110,7 @@ public class ReportDocumentMainRespVO {
     @ExcelProperty("报表类型ID")
     private Long configReportTypeId;
 
+    @Schema(description = "表单设计器模板id")
+    @ExcelProperty("表单设计器模板id")
+    private Long dataTemplateId;
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentMainSaveReqVO.java

@@ -86,5 +86,7 @@ public class ReportDocumentMainSaveReqVO {
     @Schema(description = "报告明细数据ids")
     private String reportDocumentDataIds;
 
+    @Schema(description = "表单设计器模板id")
+    private Long dataTemplateId;
 
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentTypePageReqVO.java

@@ -63,4 +63,10 @@ public class ReportDocumentTypePageReqVO extends PageParam {
 
     @Schema(description = "主id")
     private Long mainId;
+
+    @Schema(description = "前端组件")
+    private String pageComponent;
+
+    @Schema(description = "前端组件（移动端）")
+    private String pageComponentMobile;
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentTypeRespVO.java

@@ -81,4 +81,12 @@ public class ReportDocumentTypeRespVO {
     @Schema(description = "主id")
     @ExcelProperty("主id")
     private Long mainId;
+
+    @Schema(description = "前端组件")
+    @ExcelProperty("前端组件")
+    private String pageComponent;
+
+    @Schema(description = "前端组件（移动端）")
+    @ExcelProperty("前端组件（移动端）")
+    private String pageComponentMobile;
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentTypeSaveReqVO.java

@@ -66,4 +66,10 @@ public class ReportDocumentTypeSaveReqVO {
 
     @Schema(description = "主id")
     private Long mainId;
+
+    @Schema(description = "前端组件")
+    private String pageComponent;
+
+    @Schema(description = "前端组件（移动端）")
+    private String pageComponentMobile;
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/dal/dataobject/ReportDocumentMainDO.java

@@ -138,4 +138,8 @@ public class ReportDocumentMainDO extends BusinessBaseDO {
      */
     @TableField("CFG_RPT_TP_ID")
     private Long configReportTypeId;
+
+    //表单设计器模板id
+    @TableField("DAT_TMPL_ID")
+    private Long dataTemplateId;
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/dal/dataobject/ReportDocumentTypeDO.java

@@ -105,4 +105,12 @@ public class ReportDocumentTypeDO extends BusinessBaseDO {
     @TableField("MAIN_ID")
     private Long mainId;
 
+    //前端组件
+    @TableField("PG_CPNT")
+    private String pageComponent;
+
+    //前端组件-移动
+    @TableField("PG_CPNT_MOB")
+    private String pageComponentMobile;
+
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/dal/mapper/ReportDocumentTypeMapper.java

@@ -20,6 +20,7 @@ public interface ReportDocumentTypeMapper extends BaseMapperX<ReportDocumentType
 
         wrapper.eqIfPresent(ReportDocumentTypeDO::getConfigReportTypeId, reqVO.getConfigReportTypeId());
         wrapper.likeIfPresent(ReportDocumentTypeDO::getName, reqVO.getName());
+        wrapper.eqIfPresent(ReportDocumentTypeDO::getMainId, reqVO.getMainId());
         wrapper.eqIfPresent(ReportDocumentTypeDO::getFlowKey, reqVO.getFlowKey());
         wrapper.eqIfPresent(ReportDocumentTypeDO::getReportKey, reqVO.getReportKey());
         wrapper.eqIfPresent(ReportDocumentTypeDO::getCustomsDeclarationRule, reqVO.getCustomsDeclarationRule());
@@ -31,6 +32,8 @@ public interface ReportDocumentTypeMapper extends BaseMapperX<ReportDocumentType
         wrapper.betweenIfPresent(ReportDocumentTypeDO::getCreateTime, reqVO.getCreateTime());
         wrapper.eqIfPresent(ReportDocumentTypeDO::getRemark, reqVO.getRemark());
         wrapper.eqIfPresent(ReportDocumentTypeDO::getVersion, reqVO.getVersion());
+        wrapper.likeIfPresent(ReportDocumentTypeDO::getPageComponent, reqVO.getPageComponent());
+        wrapper.likeIfPresent(ReportDocumentTypeDO::getPageComponentMobile, reqVO.getPageComponentMobile());
         wrapper.orderByDesc(ReportDocumentTypeDO::getId);
         if(reqVO.getMainId() != null){
             wrapper.orderByDesc(ReportDocumentTypeDO::getVersion);

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainServiceImpl.java

@@ -234,7 +234,7 @@ public class ReportDocumentMainServiceImpl implements ReportDocumentMainService,
         String mainId = variables.getString("mainId");
         ReportDocumentMainDO entity = getReportDocumentMain(Long.valueOf(mainId));
         if("3".equals(PROCESS_STATUS)){
-            //驳回
+            //终止
             entity.setFlowStatus(QmsCommonConstant.REJECT);
         }
         if("2".equals(PROCESS_STATUS)){