diff --git a/pom.xml b/pom.xml
index b1a63d2..e7f573e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,6 @@
yunzhupaas-oauth
yunzhupaas-system
yunzhupaas-public/yunzhupaas-common-all
- yunzhupaas-example
yunzhupaas-extend
yunzhupaas-visualdev
diff --git a/yunzhupaas-admin/pom.xml b/yunzhupaas-admin/pom.xml
index 950e405..a62aace 100644
--- a/yunzhupaas-admin/pom.xml
+++ b/yunzhupaas-admin/pom.xml
@@ -85,11 +85,6 @@
yunzhupaas-oauth-controller
${project.version}
-
-
-
-
-
com.yunzhupaas
yunzhupaas-app-controller
@@ -97,6 +92,11 @@
+
+ com.yunzhupaas
+ yunzhupaas-bc-controller
+ ${project.version}
+
com.yunzhupaas
yunzhupaas-mdm-controller
@@ -107,11 +107,6 @@
yunzhupaas-cm-controller
${project.version}
-
- com.yunzhupaas
- yunzhupaas-bc-controller
- ${project.version}
-
com.yunzhupaas
diff --git a/yunzhupaas-admin/src/main/resources/application-dev.yml b/yunzhupaas-admin/src/main/resources/application-dev.yml
index c4dd5e2..3e9a5b5 100644
--- a/yunzhupaas-admin/src/main/resources/application-dev.yml
+++ b/yunzhupaas-admin/src/main/resources/application-dev.yml
@@ -24,9 +24,9 @@ spring:
# host: aliyun.szlecheng.cn
host: mysql.szlecheng.cn
port: 13306
- username: jnpfsoft
- password: ZtRmzjij4CiaXpSE
- db-name: jnpfsoft_dev
+ username: oa_yunzhupaas
+ password: OAYUNZHUPAAS
+ db-name: oa_yunzhupass
db-schema: #金仓达梦选填
prepare-url: #自定义url
@@ -205,8 +205,8 @@ config:
enable-storage: true #启用存储
enable-access: true #启用访问(线上请使用 Nginx 配置,效率更高)
domain: "" # 访问域名,例如:“http://127.0.0.1:8030/”,注意后面要和 path-patterns 保持一致,“/”结尾,本地存储建议使用相对路径,方便后期更换域名
- # base-path: /data/work-data/upload/jnpfsoft/yunzhupaas-resources/ # 基础路径
- base-path: E:/XiangMu/yunzhu/zero-resources/ # 基础路径
+ # base-path: /data/work-data/upload/yunzhupaas/yunzhupaas-resources/ # 基础路径
+ base-path: E:/workspace/yunzhupaas/v2.0/springboot/yunzhupaas-resources/ # 基础路径
path-patterns: /** # 访问路径
storage-path: # 存储路径
aliyun-oss: # 阿里云 OSS ,不使用的情况下可以不写
diff --git a/yunzhupaas-admin/src/main/resources/application.yml b/yunzhupaas-admin/src/main/resources/application.yml
index 959e193..03f44e8 100644
--- a/yunzhupaas-admin/src/main/resources/application.yml
+++ b/yunzhupaas-admin/src/main/resources/application.yml
@@ -3,7 +3,7 @@ spring:
name: yunzhupaas-boot
profiles:
# 指定环境配置 dev(开发环境-默认)、test(测试环境)、preview(预生产)、prod(生产环境)
- active: prod
+ active: dev
servlet:
multipart: #文件传输配置
max-file-size: 100MB #单个数据大小限制
@@ -154,7 +154,7 @@ logging:
log:
level:
# 等级 TRACE,DEBUG,INFO,WARN,ERROR(不区分大小写)
- root: info
+ root: INFO
path: log/${spring.application.name}
mybatis:
mapper-locations: classpath*:com/**/mapper/**/*.xml
diff --git a/yunzhupaas-cm/yunzhupaas-cm-biz/src/main/java/com/yunzhupaas/cm/mapper/ContractPrintingTempMapper.java b/yunzhupaas-cm/yunzhupaas-cm-biz/src/main/java/com/yunzhupaas/cm/mapper/ContractPrintingTempMapper.java
new file mode 100644
index 0000000..1f63f21
--- /dev/null
+++ b/yunzhupaas-cm/yunzhupaas-cm-biz/src/main/java/com/yunzhupaas/cm/mapper/ContractPrintingTempMapper.java
@@ -0,0 +1,17 @@
+package com.yunzhupaas.cm.mapper;
+
+
+import com.yunzhupaas.cm.entity.ContractPrintingTempEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhupaas.base.mapper.SuperMapper;
+
+/**
+ * 合同模版
+ * 版本: V5.2.7
+ * 版权: Copyright @ 2025 深圳市乐程软件有限公司版权所有
+ * 作者: 深圳市乐程软件有限公司
+ * 日期: 2026-05-20
+ */
+public interface ContractPrintingTempMapper extends SuperMapper {
+
+}
diff --git a/yunzhupaas-cm/yunzhupaas-cm-biz/src/main/java/com/yunzhupaas/cm/mapper/ContractTempMapper.java b/yunzhupaas-cm/yunzhupaas-cm-biz/src/main/java/com/yunzhupaas/cm/mapper/ContractTempMapper.java
new file mode 100644
index 0000000..4fced4f
--- /dev/null
+++ b/yunzhupaas-cm/yunzhupaas-cm-biz/src/main/java/com/yunzhupaas/cm/mapper/ContractTempMapper.java
@@ -0,0 +1,17 @@
+package com.yunzhupaas.cm.mapper;
+
+
+import com.yunzhupaas.cm.entity.ContractTempEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhupaas.base.mapper.SuperMapper;
+
+/**
+ * 合同模版
+ * 版本: V5.2.7
+ * 版权: Copyright @ 2025 深圳市乐程软件有限公司版权所有
+ * 作者: 深圳市乐程软件有限公司
+ * 日期: 2026-05-20
+ */
+public interface ContractTempMapper extends SuperMapper {
+
+}
diff --git a/yunzhupaas-cm/yunzhupaas-cm-biz/src/main/java/com/yunzhupaas/cm/service/ContractPrintingTempService.java b/yunzhupaas-cm/yunzhupaas-cm-biz/src/main/java/com/yunzhupaas/cm/service/ContractPrintingTempService.java
new file mode 100644
index 0000000..62a7192
--- /dev/null
+++ b/yunzhupaas-cm/yunzhupaas-cm-biz/src/main/java/com/yunzhupaas/cm/service/ContractPrintingTempService.java
@@ -0,0 +1,14 @@
+package com.yunzhupaas.cm.service;
+
+import com.yunzhupaas.cm.entity.*;
+import com.yunzhupaas.base.service.SuperService;
+
+/**
+ * 合同模版管理
+ * 版本: V5.2.7
+ * 版权: Copyright @ 2025 深圳市乐程软件有限公司版权所有
+ * 作者: 深圳市乐程软件有限公司
+ * 日期: 2026-05-21
+ */
+public interface ContractPrintingTempService extends SuperService {
+}
diff --git a/yunzhupaas-cm/yunzhupaas-cm-biz/src/main/java/com/yunzhupaas/cm/service/ContractTempService.java b/yunzhupaas-cm/yunzhupaas-cm-biz/src/main/java/com/yunzhupaas/cm/service/ContractTempService.java
new file mode 100644
index 0000000..01a9772
--- /dev/null
+++ b/yunzhupaas-cm/yunzhupaas-cm-biz/src/main/java/com/yunzhupaas/cm/service/ContractTempService.java
@@ -0,0 +1,31 @@
+package com.yunzhupaas.cm.service;
+
+import com.yunzhupaas.cm.entity.*;
+import com.yunzhupaas.base.service.SuperService;
+import com.yunzhupaas.cm.model.contracttemp.*;
+import java.util.*;
+
+/**
+ * 合同模版管理
+ * 版本: V5.2.7
+ * 版权: Copyright @ 2025 深圳市乐程软件有限公司版权所有
+ * 作者: 深圳市乐程软件有限公司
+ * 日期: 2026-05-21
+ */
+public interface ContractTempService extends SuperService {
+ List getList(ContractTempPagination contractTempPagination);
+
+ List getTypeList(ContractTempPagination contractTempPagination,String dataType);
+
+ ContractTempEntity getInfo(String contracttempid);
+
+ void delete(ContractTempEntity entity);
+
+ void create(ContractTempEntity entity);
+
+ boolean update(String contracttempid, ContractTempEntity entity);
+
+ String checkForm(ContractTempForm form,int i);
+
+ void saveOrUpdate(ContractTempForm contractTempForm,String id, boolean isSave) throws Exception;
+}
diff --git a/yunzhupaas-cm/yunzhupaas-cm-biz/src/main/java/com/yunzhupaas/cm/service/impl/ContractPrintingTempServiceImpl.java b/yunzhupaas-cm/yunzhupaas-cm-biz/src/main/java/com/yunzhupaas/cm/service/impl/ContractPrintingTempServiceImpl.java
new file mode 100644
index 0000000..84965c5
--- /dev/null
+++ b/yunzhupaas-cm/yunzhupaas-cm-biz/src/main/java/com/yunzhupaas/cm/service/impl/ContractPrintingTempServiceImpl.java
@@ -0,0 +1,34 @@
+
+package com.yunzhupaas.cm.service.impl;
+
+import com.yunzhupaas.cm.entity.*;
+import com.yunzhupaas.cm.mapper.ContractPrintingTempMapper;
+import com.yunzhupaas.cm.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhupaas.cm.model.contracttemp.*;
+import org.springframework.stereotype.Service;
+import com.yunzhupaas.base.service.SuperServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yunzhupaas.util.GeneraterSwapUtil;
+import java.sql.Connection;
+import java.sql.SQLException;
+import lombok.Cleanup;
+import com.yunzhupaas.database.plugins.DynamicSourceGeneratorInterface;
+import com.yunzhupaas.database.util.DynamicDataSourceUtil;
+import org.apache.commons.collections4.CollectionUtils;
+import com.yunzhupaas.i18n.util.I18nUtil;
+import com.yunzhupaas.exception.DataException;
+import com.yunzhupaas.constant.MsgCode;
+/**
+ *
+ * 合同模版管理
+ * 版本: V5.2.7
+ * 版权: Copyright @ 2025 深圳市乐程软件有限公司版权所有
+ * 作者: 深圳市乐程软件有限公司
+ * 日期: 2026-05-21
+ */
+@Service
+public class ContractPrintingTempServiceImpl extends SuperServiceImpl implements ContractPrintingTempService{
+ @Autowired
+ private GeneraterSwapUtil generaterSwapUtil;
+}
diff --git a/yunzhupaas-cm/yunzhupaas-cm-biz/src/main/java/com/yunzhupaas/cm/service/impl/ContractTempServiceImpl.java b/yunzhupaas-cm/yunzhupaas-cm-biz/src/main/java/com/yunzhupaas/cm/service/impl/ContractTempServiceImpl.java
new file mode 100644
index 0000000..9d56e3e
--- /dev/null
+++ b/yunzhupaas-cm/yunzhupaas-cm-biz/src/main/java/com/yunzhupaas/cm/service/impl/ContractTempServiceImpl.java
@@ -0,0 +1,352 @@
+
+package com.yunzhupaas.cm.service.impl;
+
+import com.yunzhupaas.cm.entity.*;
+import com.yunzhupaas.cm.mapper.ContractTempMapper;
+import com.yunzhupaas.cm.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhupaas.cm.model.contracttemp.*;
+import org.springframework.stereotype.Service;
+import com.yunzhupaas.base.service.SuperServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yunzhupaas.util.GeneraterSwapUtil;
+import java.sql.Connection;
+import java.sql.SQLException;
+import lombok.Cleanup;
+import com.yunzhupaas.database.plugins.DynamicSourceGeneratorInterface;
+import com.yunzhupaas.database.util.DynamicDataSourceUtil;
+import org.apache.commons.collections4.CollectionUtils;
+import com.yunzhupaas.i18n.util.I18nUtil;
+import com.yunzhupaas.exception.DataException;
+import com.yunzhupaas.constant.MsgCode;
+import java.math.BigDecimal;
+import cn.hutool.core.util.ObjectUtil;
+import java.lang.reflect.Field;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import com.yunzhupaas.base.model.ColumnDataModel;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.transaction.annotation.Transactional;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.yulichang.toolkit.JoinWrappers;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.yunzhupaas.model.QueryAllModel;
+import java.text.SimpleDateFormat;
+import com.yunzhupaas.util.*;
+import java.util.*;
+import com.yunzhupaas.base.UserInfo;
+import com.yunzhupaas.permission.entity.UserEntity;
+import com.github.pagehelper.PageHelper;
+/**
+ *
+ * 合同模版管理
+ * 版本: V5.2.7
+ * 版权: Copyright @ 2025 深圳市乐程软件有限公司版权所有
+ * 作者: 深圳市乐程软件有限公司
+ * 日期: 2026-05-21
+ */
+@Service
+public class ContractTempServiceImpl extends SuperServiceImpl implements ContractTempService{
+ @Autowired
+ private GeneraterSwapUtil generaterSwapUtil;
+ @Autowired
+ private UserProvider userProvider;
+ @Autowired
+ private ContractPrintingTempService contractPrintingTempService;
+ @Override
+ public List getList(ContractTempPagination contractTempPagination){
+ return getTypeList(contractTempPagination,contractTempPagination.getDataType());
+ }
+ /** 列表查询 */
+ @Override
+ public List getTypeList(ContractTempPagination contractTempPagination,String dataType){
+ String userId=userProvider.get().getUserId();
+ Map tableClassMap=new HashMap<>();
+ tableClassMap.put("cm_contract_temp",ContractTempEntity.class);
+ tableClassMap.put("cm_contract_printing_temp",ContractPrintingTempEntity.class);
+
+ MPJLambdaWrapper wrapper = JoinWrappers
+ .lambda("cm_contract_temp",ContractTempEntity.class)
+ .selectCollection(ContractPrintingTempEntity.class,ContractTempEntity::getContractPrintingTemp)
+ .leftJoin(ContractPrintingTempEntity.class,"cm_contract_printing_temp",ContractPrintingTempEntity::getContractTempId,ContractTempEntity::getContractTempCode)
+ .selectAll(ContractTempEntity.class);
+ MPJLambdaWrapper wrapper2 = JoinWrappers
+ .lambda("cm_contract_temp",ContractTempEntity.class)
+ .leftJoin(ContractPrintingTempEntity.class,"cm_contract_printing_temp",ContractPrintingTempEntity::getContractTempId,ContractTempEntity::getContractTempCode)
+ .distinct().select(ContractTempEntity::getContractTempId);
+
+ QueryAllModel queryAllModel = new QueryAllModel();
+ queryAllModel.setWrapper(wrapper);
+ queryAllModel.setClassMap(tableClassMap);
+ queryAllModel.setDbLink(ContractTempConstant.DBLINKID);
+ //数据过滤
+ boolean isPc = ServletUtil.getHeader("yunzhupaas-origin").equals("pc");
+ String columnData = !isPc ? ContractTempConstant.getAppColumnData() : ContractTempConstant.getColumnData();
+ ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
+ String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
+ queryAllModel.setRuleJson(ruleJson);
+ //高级查询
+ boolean hasSuperQuery = true;
+ if (hasSuperQuery) {
+ queryAllModel.setSuperJson(contractTempPagination.getSuperQueryJson());
+ }
+ //数据权限
+ boolean pcPermission = false;
+ boolean appPermission = false;
+ if (isPc && pcPermission) {
+ queryAllModel.setModuleId(contractTempPagination.getMenuId());
+ }
+ if (!isPc && appPermission) {
+ queryAllModel.setModuleId(contractTempPagination.getMenuId());
+ }
+ //拼接复杂条件
+ wrapper = generaterSwapUtil.getConditionAllTable(queryAllModel);
+ if(wrapper == null) return new ArrayList<>();
+ queryAllModel.setWrapper(wrapper2);
+ wrapper2 = generaterSwapUtil.getConditionAllTable(queryAllModel);
+ //其他条件拼接
+ otherConditions(contractTempPagination, wrapper, isPc);
+ otherConditions(contractTempPagination, wrapper2, isPc);
+
+ if("0".equals(dataType)){
+ com.github.pagehelper.Page