zgty/zt-base
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、修改bug

Browse Source
This commit is contained in:
潘荣晟
2025-10-27 18:01:38 +08:00
parent c51117ef02
commit 5859062014
14 changed files with 218 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TmplTpController.java
View File

@@ -124,8 +124,8 @@ public class TmplTpController extends AbstractFileUploadController implements Bu
//获取分类树
@GetMapping("/tree")
@Operation(summary = "获得分类树--上级")
public CommonResult<List<TmplTpTreeVO>> getTree() {
List<TmplTpTreeVO> tree = tmplTpService.buildTree();
public CommonResult<List<TmplTpTreeVO>> getTree(@RequestParam(value = "num",required = false) String num,@RequestParam(value = "name",required = false) String name) {
List<TmplTpTreeVO> tree = tmplTpService.buildTree(num,name);
return success(tree);
}

7
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TmplFldRespVO.java
View File

@@ -42,5 +42,10 @@ public class TmplFldRespVO {
@Schema(description = "字段状态", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("字段状态")
private String sts;
private Integer sts;
@Schema(description = "创建人名", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建人名")
private String creatorName;
}

7
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TmplItmRespVO.java
View File

@@ -47,6 +47,11 @@ public class TmplItmRespVO {
@Schema(description = "字段状态", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("字段状态")
private String sts;
private Integer sts;
@Schema(description = "创建人名", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建人名")
private String creatorName;
}

2
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TmplItmSaveReqVO.java
View File

@@ -25,5 +25,5 @@ public class TmplItmSaveReqVO {
private String itmVal;
@Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "启用 or 禁用")
private String sts;
private Integer sts;
}

4
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TmplTpFldSaveReqVO.java
View File

@@ -22,7 +22,7 @@ public class TmplTpFldSaveReqVO {
@Schema(description = "是否必填", requiredMode = Schema.RequiredMode.REQUIRED, example = "Y or N")
private String isMust;
@Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "启用 or 禁用")
private String sts;
@Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "启用 or 禁用(0或1)")
private Integer sts;
}

2
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplItmDO.java
View File

@@ -30,6 +30,6 @@ public class TmplItmDO extends BusinessBaseDO {
private String itmVal;
@TableField("STS")
private String sts;
private Integer sts;
}

2
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplTpFldDO.java
View File

@@ -75,5 +75,5 @@ public class TmplTpFldDO extends BusinessBaseDO { // 继承业务基类，自动
private String orgnTp;
@TableField("STS")
private String sts;
private Integer sts;
}

2
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplTpFldMapper.java
View File

@@ -13,7 +13,7 @@ public interface TmplTpFldMapper extends BaseMapperX<TmplTpFldDO> {
default PageResult<TmplTpFldDO> selectPage(TmplFldPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<TmplTpFldDO>()
.likeIfPresent(TmplTpFldDO::getFldName, reqVO.getFldName())
.eqIfPresent(TmplTpFldDO::getFldKy, reqVO.getFldKy())
.likeIfPresent(TmplTpFldDO::getFldKy, reqVO.getFldKy())
.eqIfPresent(TmplTpFldDO::getFldDoc, reqVO.getFldDoc())
.eqIfPresent(TmplTpFldDO::getIsMust, reqVO.getIsMust())
.eqIfPresent(TmplTpFldDO::getDatTp, reqVO.getDatTp())

10
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceServiceImpl.java
View File

@@ -212,13 +212,17 @@ public class TemplateInstanceServiceImpl implements TemplateInstanceService {
}
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public void publishTemplateInstance(List<PublishTemplateInstanceReqVO> publishReqVOS) {
// 校验当前状态是否能够进行发布
publishReqVOS.forEach(reqVO -> {
TemplateInstanceDO templateInstanceDO = templateInstanceMapper.selectById(reqVO.getId());
if (templateInstanceDO.getCntt()==null||templateInstanceDO.getCntt().isEmpty()){
throw exception(TEMPLATE_INSTANCE_FILE_NOT_EXISTS);
}
String currentStatus = reqVO.getCurrentStatus();
if (currentStatus.isEmpty()) {
currentStatus = templateInstanceMapper.selectById(reqVO.getId()).getSts();
currentStatus =templateInstanceDO.getSts();
}
PublishStatusEnum status = PublishStatusEnum.fromCode(currentStatus);
boolean transitionAllowed = false;
@@ -237,7 +241,7 @@ public class TemplateInstanceServiceImpl implements TemplateInstanceService {
.in(TemplateInstanceDO::getId, publishReqVOS.stream()
.map(PublishTemplateInstanceReqVO::getId)
.collect(Collectors.toSet()))
.set(TemplateInstanceDO::getSts, TmplStsEnum.PUBLISHED.getCode()));
.set(TemplateInstanceDO::getSts, TmplStsEnum.PUBLISHED.getCode()).set(TemplateInstanceDO::getPublishTime, LocalDateTime.now()));
log.info("更新模版实例状态成功【{}】", publishReqVOS.stream().map(PublishTemplateInstanceReqVO::getId));
}

15
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplItmServiceImpl.java
View File

@@ -22,7 +22,7 @@ import org.springframework.validation.annotation.Validated;
import java.util.List;
import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.zt.plat.module.tmpltp.enums.ErrorCodeConstants.TMPL_ITM_NAME_EXISTS;
import static com.zt.plat.module.tmpltp.enums.ErrorCodeConstants.TMPL_ITM_NAME_CODE_EXISTS;
import static com.zt.plat.module.tmpltp.enums.ErrorCodeConstants.TMPL_ITM_NOT_EXISTS;
@Service
@@ -32,9 +32,10 @@ public class TmplItmServiceImpl extends ServiceImpl<TmplItmMapper, TmplItmDO> im
@Override
public TmplItmRespVO createTmplItm(TmplItmSaveReqVO tmplItmSaveReqVO) {
//验证条款名是否存在
validateTmplLtmNameExists(tmplItmSaveReqVO.getItmName());
validateTmplLtmNameAndCodeExists(tmplItmSaveReqVO.getItmName(), tmplItmSaveReqVO.getItmNum());
tmplItmSaveReqVO.setId(null);
TmplItmDO bean = BeanUtils.toBean(tmplItmSaveReqVO, TmplItmDO.class);
bean.setSts(1);
baseMapper.insert(bean);
return BeanUtils.toBean(bean, TmplItmRespVO.class);
}
@@ -59,9 +60,13 @@ public class TmplItmServiceImpl extends ServiceImpl<TmplItmMapper, TmplItmDO> im
throw exception(TMPL_ITM_NOT_EXISTS);
}
}
private void validateTmplLtmNameExists(String name){
if (baseMapper.selectCount(new LambdaQueryWrapper<TmplItmDO>().eq(TmplItmDO::getItmName,name).eq(TmplItmDO::getDeleted,0).eq(TmplItmDO::getCompanyId, CompanyContextHolder.getCompanyId()))>0) {
throw exception(TMPL_ITM_NAME_EXISTS);
private void validateTmplLtmNameAndCodeExists(String name, String code){
if (baseMapper.selectCount(new LambdaQueryWrapper<TmplItmDO>()
.eq(TmplItmDO::getDeleted, 0)
.eq(TmplItmDO::getCompanyId, CompanyContextHolder.getCompanyId())
.and(wrapper -> wrapper.eq(TmplItmDO::getItmName, name).or().eq(TmplItmDO::getItmNum, code))
) > 0) {
throw exception(TMPL_ITM_NAME_CODE_EXISTS);
}
}

Some files were not shown because too many files have changed in this diff Show More