diff --git a/pusong-admin/pom.xml b/pusong-admin/pom.xml index 2b5555a..c75b9d1 100644 --- a/pusong-admin/pom.xml +++ b/pusong-admin/pom.xml @@ -144,6 +144,25 @@ ${project.artifactId} + + + + org.apache.maven.plugins + maven-jar-plugin + 3.3.0 + + + + *.java + static/ + db/ + templates/ + *.yml + *.txt + logback.xml + + + diff --git a/pusong-admin/src/main/resources/application-prod.yml b/pusong-admin/src/main/resources/application-prod.yml index 8839cba..ebb1dfa 100644 --- a/pusong-admin/src/main/resources/application-prod.yml +++ b/pusong-admin/src/main/resources/application-prod.yml @@ -45,7 +45,7 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:mysql://127.0.0.1:3306/pusongplus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://47.95.38.123:3306/pusongplus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true username: root password: Ps123456@ # 从库数据源 @@ -94,7 +94,7 @@ spring: spring.data: redis: # 地址 - host: 127.0.0.1 + host: 47.95.38.123 # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/pusong-admin/src/main/resources/application.yml b/pusong-admin/src/main/resources/application.yml index bef9285..310530e 100644 --- a/pusong-admin/src/main/resources/application.yml +++ b/pusong-admin/src/main/resources/application.yml @@ -46,7 +46,7 @@ logging: level: org.dromara: @logging.level@ org.springframework: info - org.mybatis.spring.mapper: debug + org.mybatis.spring.mapper: info config: classpath:logback-plus.xml # 用户配置 diff --git a/pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/handler/InjectionMetaObjectHandler.java b/pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/handler/InjectionMetaObjectHandler.java index 2ef0624..a23cdf2 100644 --- a/pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/handler/InjectionMetaObjectHandler.java +++ b/pusong-common/pusong-common-mybatis/src/main/java/com/pusong/common/mybatis/handler/InjectionMetaObjectHandler.java @@ -27,7 +27,9 @@ public class InjectionMetaObjectHandler implements MetaObjectHandler { if (ObjectUtil.isNotNull(metaObject) && metaObject.getOriginalObject() instanceof BaseEntity baseEntity) { Date current = ObjectUtil.isNotNull(baseEntity.getCreateTime()) ? baseEntity.getCreateTime() : new Date(); - baseEntity.setCreateTime(current); + if (baseEntity.getCreateTime() == null){ + baseEntity.setCreateTime(current); + } baseEntity.setUpdateTime(current); if (ObjectUtil.isNull(baseEntity.getCreateBy())) { LoginUser loginUser = getLoginUser(); diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsCustomInfoBo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsCustomInfoBo.java index d4dbf3b..fc8066a 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsCustomInfoBo.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsCustomInfoBo.java @@ -1,5 +1,6 @@ package com.pusong.business.domain.bo; +import com.fasterxml.jackson.annotation.JsonFormat; import com.pusong.business.domain.PsCustomInfo; import com.pusong.common.core.validate.AddGroup; import com.pusong.common.core.validate.EditGroup; @@ -11,6 +12,7 @@ import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; import org.hibernate.validator.constraints.Length; +import java.util.Date; import java.util.List; /** @@ -119,4 +121,7 @@ public class PsCustomInfoBo { * 删除的公司id集合（修改客户信息时使用） */ private List companyIds; + + @JsonFormat(pattern = "yyyy-MM-dd hh:mm") + private Date createTime; } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/mapper/PsTaskMainMapper.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/mapper/PsTaskMainMapper.java index 06984fb..afc791b 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/mapper/PsTaskMainMapper.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/mapper/PsTaskMainMapper.java @@ -35,7 +35,7 @@ public interface PsTaskMainMapper extends BaseMapper { @DataPermission({ - @DataColumn(key = "deptName", value = "appo.create_dept"), +// @DataColumn(key = "deptName", value = "appo.create_dept"), @DataColumn(key = "userName", value = "appo.executor") }) Page queryChildTaskPageList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); diff --git a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsCompanyInfoMapper.xml b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsCompanyInfoMapper.xml index b6b27df..e526258 100644 --- a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsCompanyInfoMapper.xml +++ b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsCompanyInfoMapper.xml @@ -24,12 +24,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" com.* ,cus.custom_manager - ,cc.is_proxy + ,bus.is_proxy from ps_company_info com left join ps_custom_info cus on cus.id = com.custom_id - inner join ps_contract_company cc on cc.contract_code = ${contractCode} and cc.company_id = com.id +-- inner join ps_contract_company cc on cc.contract_code = ${contractCode} and cc.company_id = com.id + left join ps_contract_business bus on bus.company_id = com.id and bus.contract_code = ${contractCode} ${ew.getCustomSqlSegment}