Merge branch 'dev' into 'test'

国贸2.0系统推送合同回调：消息固定R_JG_MY_00应答，_interfaceType__固定传R_MY_JG_10

See merge request jygk/dsc-base!18

base-server/src/main/resources/application-dev.yml

@@ -105,3 +105,41 @@ justauth:
     prefix: 'social_auth_state:' # 缓存前缀，目前只对 Redis 缓存生效，默认 JUSTAUTH::STATE::
     timeout: 24h # 超时时长，目前只对 Redis 缓存生效，默认 3 分钟
 
+erp:
+  address: hana-dev.yncic.com
+  sapsys: ZTDEV203
+
+eplat:
+  share:
+    #ePlat共享服务请求地址前缀
+    urlPrex: http://10.1.7.110
+    #ePlat分配的clientId
+    clientId: ztjgj5gsJ2uU20900h9j
+    #ePlat分配的密钥
+    clientSecret: DC82AD38EA764719B6DC7D71AAB4856C
+
+seata:
+  enabled: true
+  application-id: base-server
+  tx-service-group: dev_tx_group
+  enable-auto-data-source-proxy: true
+  data-source-proxy-mode: AT
+  registry:
+    type: file
+  config:
+    type: file
+  service:
+    vgroupMapping:
+      default_tx_group: default
+      dev_tx_group: default
+      test_tx_group: default
+      prod_tx_group: default
+    default:
+      grouplist: 172.16.46.63:30088
+  client:
+    tm:
+      defaultGlobalTransactionTimeout: 60000
+    undo:
+      logTable: undo_log
+      dataValidation: true
+      logSerialization: jackson

base-server/src/main/resources/application-local.yml

@@ -95,3 +95,41 @@ zt:
   access-log: # 访问日志的配置项
     enable: true
 
+erp:
+  address: hana-dev.yncic.com
+  sapsys: ZTDEV203
+
+eplat:
+  share:
+    #ePlat共享服务请求地址前缀
+    urlPrex: http://10.1.7.110
+    #ePlat分配的clientId
+    clientId: ztjgj5gsJ2uU20900h9j
+    #ePlat分配的密钥
+    clientSecret: DC82AD38EA764719B6DC7D71AAB4856C
+
+seata:
+  enabled: true
+  application-id: base-server
+  tx-service-group: dev_tx_group
+  enable-auto-data-source-proxy: true
+  data-source-proxy-mode: AT
+  registry:
+    type: file
+  config:
+    type: file
+  service:
+    vgroupMapping:
+      default_tx_group: default
+      dev_tx_group: default
+      test_tx_group: default
+      prod_tx_group: default
+    default:
+      grouplist: 172.16.46.63:30088
+  client:
+    tm:
+      defaultGlobalTransactionTimeout: 60000
+    undo:
+      logTable: undo_log
+      dataValidation: true
+      logSerialization: jackson

zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/tmpltp/enums/ErrorCodeConstants.java

@@ -32,6 +32,8 @@ public interface ErrorCodeConstants {
     ErrorCode FILE_UPLOAD_EER = new ErrorCode(1_027_000_523, "文件上传失败");
     ErrorCode TMPL_INSC_ITM_BSN_NOT_EXISTS = new ErrorCode(1_027_000_524, "业务实例条款不存在");
     ErrorCode TMPL_INSC_DAT_BSN_NOT_EXISTS = new ErrorCode(1_027_000_530, "业务实例字段不存在");
+    ErrorCode TMPL_INSC_ITM_BSN_EXISTS = new ErrorCode(1_027_000_540, "业务实例条款已存在");
+    ErrorCode TMPL_INSC_DAT_BSN_EXISTS = new ErrorCode(1_027_000_541, "业务实例条款已存在");
     //Illegal operation type
 }
 

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TmplInscBsnRelController.java

@@ -85,12 +85,7 @@ public class TmplInscBsnRelController implements BusinessControllerMarker {
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('base:tmpl-insc-bsn-rel:query')")
     public CommonResult<TmplInscBsnRelRespVO> getTmplInscBsnRel(@RequestParam("id") Long id) {
-        TmplInscBsnRelDO tmplInscBsnRel = tmplInscBsnRelService.getTmplInscBsnRel(id);
+        return success(tmplInscBsnRelService.getTmplInscBsnRel(id));
-        TmplInscBsnRelRespVO tmplInscBsnRelRespVO = BeanUtils.toBean(tmplInscBsnRel, TmplInscBsnRelRespVO.class);
-        if (tmplInscBsnRelRespVO != null) {
-            tmplInscBsnRelService.getTmplInscBsnRelDetails(tmplInscBsnRelRespVO);
-        }
-        return success(tmplInscBsnRelRespVO);
     }
 
     @GetMapping("/page")
@@ -120,4 +115,19 @@ public class TmplInscBsnRelController implements BusinessControllerMarker {
                 BeanUtils.toBean(list, TmplInscBsnRelRespVO.class));
     }
 
+
+    @GetMapping("/value-info")
+    @Operation(summary = "根据合Id和实例Id获取字段和条款")
+    @PreAuthorize("@ss.hasPermission('base:tmpl-insc-bsn-rel:query')")
+    public CommonResult<Map<String, Object>> valueInfo(@RequestParam("cttId") @Valid @NotEmpty(message = "合同Id不能为空") String cttId, @RequestParam("inscId") @Valid @NotEmpty(message = "模版实例id不能为空") String inscId) {
+        return success(tmplInscBsnRelService.valueInfo(cttId, inscId));
+    }
+
+    @GetMapping("/bsn-info")
+    @Operation(summary = "根据合id和实例id获取中间表")
+    @PreAuthorize("@ss.hasPermission('base:tmpl-insc-bsn-rel:query')")
+    public CommonResult<TmplInscBsnRelRespVO> bseInfo(@RequestParam("cttId") @Valid @NotEmpty(message = "合同Id不能为空") String cttId, @RequestParam("inscId") @Valid @NotEmpty(message = "模版实例id不能为空") String inscId) {
+        return success(tmplInscBsnRelService.bseInfo(cttId, inscId));
+    }
+
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/onlyoffice/service/OnlyOfficeCallbackServiceImpl.java

@@ -5,6 +5,8 @@ import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.module.base.controller.admin.templtp.onlyoffice.pojo.Action;
 import com.zt.plat.module.base.controller.admin.templtp.onlyoffice.pojo.History;
 import com.zt.plat.module.base.controller.admin.templtp.onlyoffice.pojo.OnlyOfficeCallback;
+import com.zt.plat.module.base.dal.dataobject.tmpltp.TmplInscBsnRelDO;
+import com.zt.plat.module.base.dal.mysql.tmpltp.TmplInscBsnRelMapper;
 import com.zt.plat.module.base.service.tmpltp.TemplateInstanceService;
 import com.zt.plat.module.infra.api.file.FileApi;
 import com.zt.plat.module.infra.api.file.dto.FileCreateReqDTO;
@@ -29,7 +31,7 @@ import static com.zt.plat.module.base.controller.admin.templtp.onlyoffice.util.U
 public class OnlyOfficeCallbackServiceImpl implements OnlyOfficeCallbackService {
     private final FileApi fileApi;
     private final TemplateInstanceService templateInstanceService;
-
+    private final TmplInscBsnRelMapper tmplInscBsnRelMapper;
     @Override
     public void processCallback(OnlyOfficeCallback callback, String id,String fileName) {
         log.info("收到OnlyOffice文档回调: {}", callback.getKey());
@@ -354,7 +356,10 @@ public class OnlyOfficeCallbackServiceImpl implements OnlyOfficeCallbackService
                 fileInfo.put("name", fileRespDTO.getName());
                 fileInfo.put("directory", fileRespDTO.getDirectory());
                 fileInfo.put("key", callback.getKey());
-                templateInstanceService.updateTemplateInstanceFileUrlByInstanceId(id, JSONObject.toJSONString(fileInfo));
+                TmplInscBsnRelDO createReqVO = new TmplInscBsnRelDO();
+                createReqVO.setId(Long.valueOf(id));
+                createReqVO.setCntt(JSONObject.toJSONString(fileInfo));
+                tmplInscBsnRelMapper.updateById(createReqVO);
             } else {
                 // 创建文件失败，处理错误
                 log.error("文件创建失败，错误信息：{}", result.getMsg());

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/FieldAndClauseRespVO.java

@@ -8,7 +8,7 @@ import java.util.List;
 @Schema(description = "管理后台 - 合同动态表单 响应 VO")
 @Data
 public class FieldAndClauseRespVO {
-    @Schema(description = "模板分类")
+    @Schema(description = "模板字段")
     List<TmplFldRespVO> tmplFldRespVOS;
     @Schema(description = "条款")
     List<TmplItmRespVO> tmplItmRespVOS;

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TmplInscBsnRelRespVO.java

@@ -42,18 +42,18 @@ public class TmplInscBsnRelRespVO {
     private List<String> deptIds;
 
 
-    @Schema(description = "实例字段;这个是实例字段绑定的字段", requiredMode = Schema.RequiredMode.REQUIRED, example = "")
+//    @Schema(description = "实例字段;这个是实例字段绑定的字段", requiredMode = Schema.RequiredMode.REQUIRED, example = "")
-    private List<TemplateInstanceDataRespVO> templateInstanceDataRespVOS;
+//    private List<TemplateInstanceDataRespVO> templateInstanceDataRespVOS;
 
-    @Schema(description = "实例条款；这个是实例条款绑定的条款;", requiredMode = Schema.RequiredMode.REQUIRED, example = "")
+//    @Schema(description = "实例条款；这个是实例条款绑定的条款;", requiredMode = Schema.RequiredMode.REQUIRED, example = "")
-    private List<TemplateInstanceItemRespVO> instanceItemRespVOS;
+//    private List<TemplateInstanceItemRespVO> instanceItemRespVOS;
 
     @Schema(description = "使用部门编", requiredMode = Schema.RequiredMode.REQUIRED, example = "")
     private List<DeptRespDTO> DeptRespVOS;
 
-    @Schema(description = "模版实例名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "测试分类名称")
+//    @Schema(description = "模版实例名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "测试分类名称")
-    @ExcelProperty("模版实例名称")
+//    @ExcelProperty("模版实例名称")
-    private String inscName;
+//    private String inscName;
 
     @Schema(description = "业务实例字段", requiredMode = Schema.RequiredMode.REQUIRED, example = "")
     @ExcelProperty("业务实例字段")

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscBsnRelService.java

@@ -53,7 +53,7 @@ public interface TmplInscBsnRelService {
      * @param id 编号
      * @return 模板实例与业务中间
      */
-    TmplInscBsnRelDO getTmplInscBsnRel(Long id);
+    TmplInscBsnRelRespVO getTmplInscBsnRel(Long id);
 
     /**
      * 获得模板实例与业务中间分页
@@ -70,9 +70,22 @@ public interface TmplInscBsnRelService {
     void getTmplInscBsnRelDetails(TmplInscBsnRelRespVO tmplInscBsnRelRespVO);
 
     /**
-     * 跟新cntt
+     * 更新cntt
      *
      * @param bsnId ,params
      */
     void updateCntt(Long bsnId,String params);
+    /**
+     * 获取字段和条款
+     *
+     * @param cttId ,inscId
+     */
+    Map<String,Object> valueInfo(String cttId,String inscId);
+
+    /**
+     * 获取中间表
+     *
+     * @param cttId ,inscId
+     */
+    TmplInscBsnRelRespVO bseInfo(String cttId,String inscId);
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscDatBsnService.java

@@ -69,5 +69,12 @@ public interface TmplInscDatBsnService {
      *
      */
     void deleteTmplInscDatBsnListByBsnIds(@Valid @NotEmpty(message = "业务编号不能为空") List<String> ids);
+    /**
+     * 通过业务id查询业务字段
+     *
+     * @param id 业务id
+     *
+     */
+    List<TmplInscDatBsnRespVO> getTmplInscDatBsnListByBsnId(@Valid @NotEmpty(message = "业务编号不能为空") String id);
 
 }