From 8968392c0ee2776d61c6375675a655565e6eee3d Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 10 五月 2023 09:06:06 +0800
Subject: [PATCH] 修改为CodePhaseAttrMapper
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodePhaseattrServiceImpl.java | 4
/dev/null | 152 --------------------------------------
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodePhaseattrClient.java | 4
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodePhaseattrController.java | 4
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodePhaseAttrMapper.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeTempphaseServiceImpl.java | 9 -
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodePhaseAttrMapper.xml | 20 ++---
8 files changed, 18 insertions(+), 179 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodePhaseattrEntity.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodePhaseattrEntity.java
deleted file mode 100644
index bc2e34d..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodePhaseattrEntity.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the dreamlu.net developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: Chill 搴勯獮 (smallchill@163.com)
- */
-package com.vci.ubcs.code.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.vci.ubcs.starter.revision.model.BaseModel;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.EqualsAndHashCode;
-
-/**
- * 缂栫爜搴撳畾涔�-妯℃澘闃舵-灞炴�� 瀹炰綋绫�
- *
- * @author yuxc
- * @since 2023-04-20
- */
-@Data
-@TableName("PL_CODE_PHASEATTR")
-@ApiModel(value = "CodePhaseattr瀵硅薄", description = "缂栫爜搴撳畾涔�-妯℃澘闃舵-灞炴��")
-@EqualsAndHashCode(callSuper = true)
-public class CodePhaseattrEntity extends BaseModel {
-
-
- /**
- *
- */
- @ApiModelProperty(value = "")
- private String codePhaseOid;
- /**
- *
- */
- @ApiModelProperty(value = "")
- private String attributegroup;
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodePhaseattrController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodePhaseattrController.java
index 5811080..7e0516f 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodePhaseattrController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodePhaseattrController.java
@@ -20,7 +20,7 @@
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.code.entity.CodePhaseAttr;
-import com.vci.ubcs.code.mapper.CodePhaseattrMapper;
+import com.vci.ubcs.code.mapper.CodePhaseAttrMapper;
import com.vci.ubcs.code.service.ICodePhaseattrService;
import com.vci.ubcs.code.vo.CodePhaseattrVO;
import com.vci.ubcs.code.wrapper.CodePhaseattrWrapper;
@@ -51,7 +51,7 @@
private final ICodePhaseattrService CodePhaseattrService;
- private CodePhaseattrMapper codePhaseAttrMapper;
+ private CodePhaseAttrMapper codePhaseAttrMapper;
/**
* 缂栫爜搴撳畾涔�-妯℃澘闃舵-灞炴�� 璇︽儏
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodePhaseattrClient.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodePhaseattrClient.java
index 9c685fa..23880dc 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodePhaseattrClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodePhaseattrClient.java
@@ -19,7 +19,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.vci.ubcs.code.entity.CodePhaseAttr;
-import com.vci.ubcs.code.mapper.CodePhaseattrMapper;
+import com.vci.ubcs.code.mapper.CodePhaseAttrMapper;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.BladePage;
import org.springblade.core.mp.support.Condition;
@@ -39,7 +39,7 @@
@AllArgsConstructor
public class CodePhaseattrClient implements ICodePhaseattrClient {
- private final CodePhaseattrMapper codePhaseAttrMapper;
+ private final CodePhaseAttrMapper codePhaseAttrMapper;
@Override
@GetMapping(TOP)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodePhaseattrMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodePhaseAttrMapper.java
similarity index 95%
rename from Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodePhaseattrMapper.java
rename to Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodePhaseAttrMapper.java
index 0445e1d..5c430d9 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodePhaseattrMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodePhaseAttrMapper.java
@@ -28,7 +28,7 @@
* @author yuxc
* @since 2023-04-20
*/
-public interface CodePhaseattrMapper extends BaseMapper<CodePhaseAttr> {
+public interface CodePhaseAttrMapper extends BaseMapper<CodePhaseAttr> {
/**
* 鑷畾涔夊垎椤�
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
index a43b9e8..cdc0416 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
@@ -94,7 +94,7 @@
@Autowired(required = false)
private CodeClassifyTemplateButtonMapper codeTempbuttonMapper;
@Autowired(required = false)
- private CodePhaseattrMapper codePhaseattrMapper;
+ private CodePhaseAttrMapper codePhaseattrMapper;
@Autowired(required = false)
private CodeClassifyMapper codeClassifyMapper;
@Autowired(required = false)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodePhaseattrServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodePhaseattrServiceImpl.java
index 8ecb853..06962aa 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodePhaseattrServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodePhaseattrServiceImpl.java
@@ -19,7 +19,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.code.entity.CodePhaseAttr;
-import com.vci.ubcs.code.mapper.CodePhaseattrMapper;
+import com.vci.ubcs.code.mapper.CodePhaseAttrMapper;
import com.vci.ubcs.code.service.ICodePhaseattrService;
import com.vci.ubcs.code.vo.CodePhaseattrVO;
import org.springframework.stereotype.Service;
@@ -31,7 +31,7 @@
* @since 2023-04-20
*/
@Service
-public class CodePhaseattrServiceImpl extends ServiceImpl<CodePhaseattrMapper, CodePhaseAttr> implements ICodePhaseattrService {
+public class CodePhaseattrServiceImpl extends ServiceImpl<CodePhaseAttrMapper, CodePhaseAttr> implements ICodePhaseattrService {
@Override
public IPage<CodePhaseattrVO> selectCodePhaseattrPage(IPage<CodePhaseattrVO> page, CodePhaseattrVO CodePhaseattr) {
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeTempphaseServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeTempphaseServiceImpl.java
index b1f55fe..ee9e092 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeTempphaseServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeTempphaseServiceImpl.java
@@ -17,11 +17,8 @@
package com.vci.ubcs.code.service.impl;
import com.alibaba.cloud.commons.lang.StringUtils;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -30,7 +27,7 @@
import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
import com.vci.ubcs.code.dto.CodeTemplatePhaseDTO;
import com.vci.ubcs.code.entity.*;
-import com.vci.ubcs.code.mapper.CodePhaseattrMapper;
+import com.vci.ubcs.code.mapper.CodePhaseAttrMapper;
import com.vci.ubcs.code.mapper.CodeTemplatePhaseMapper;
import com.vci.ubcs.code.mapper.CommonsMapper;
import com.vci.ubcs.code.service.ICodeClassifyTemplateAttrService;
@@ -43,8 +40,6 @@
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.util.MybatisParameterUtil;
-import com.vci.ubcs.starter.web.constant.QueryOptionConstant;
-import com.vci.ubcs.starter.web.pagemodel.DataGrid;
import com.vci.ubcs.starter.web.pagemodel.PageHelper;
import com.vci.ubcs.starter.web.util.BeanUtil;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
@@ -73,7 +68,7 @@
public class CodeTempphaseServiceImpl extends ServiceImpl<CodeTemplatePhaseMapper, CodeTemplatePhase> implements ICodeTempphaseService {
@Autowired(required = false)
- private CodePhaseattrMapper codePhaseAttrMapper;
+ private CodePhaseAttrMapper codePhaseAttrMapper;
@Autowired(required = false)
private CodeTemplatePhaseMapper codeTemplatePhaseMapper;
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodePhaseAttrMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodePhaseAttrMapper.xml
index b9945a7..b23f6e2 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodePhaseAttrMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodePhaseAttrMapper.xml
@@ -31,7 +31,7 @@
<result column="OWNER" property="owner"/>
<result column="COPYFROMVERSION" property="copyFromVersion"/>
<result column="CODEPHASEOID" property="codePhaseOid"/>
- <result column="ATTRIBUTEGROUP" property="attributegroup"/>
+ <result column="ATTRIBUTEGROUP" property="attributeGroup"/>
</resultMap>
<select id="selectCodePhaseattrPage" resultMap="CodePhaseattrResultMap">
@@ -45,36 +45,32 @@
description,
oid,
versionseq,
- checkinby,
revisionrule,
lctid,
id,
owner,
- checkoutby,
creator,
createtime,
- isfirstv,
+ firstv,
attributegroup,
revisionoid,
btmname,
- checkouttime,
revisionvalue,
versionrule,
name,
- islastr,
+ lastr,
lastmodifytime,
copyfromversion,
nameoid,
lcstatus,
- islastv,
- checkintime,
+ lastv,
codephaseoid,
- isfirstr
+ firstr
from PL_CODE_PHASEATTR
where codephaseoid in
- (select oid
- from PL_CODE_TEMPPHASE
- where codeClassifyTemplateOid = #{oid})
+ (select oid
+ from PL_CODE_TEMPPHASE
+ where codeClassifyTemplateOid = #{oid})
</select>
<select id="selectByPhaseaIds" resultMap="CodePhaseattrResultMap">
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodePhaseattrMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodePhaseattrMapper.xml
deleted file mode 100644
index 663ee81..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodePhaseattrMapper.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.vci.ubcs.code.mapper.CodePhaseattrMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="CodePhaseattrResultMap" type="com.vci.ubcs.code.entity.CodePhaseAttr">
- <result column="OID" property="oid"/>
- <result column="REVISIONOID" property="revisionOid"/>
- <result column="NAMEOID" property="nameOid"/>
- <result column="BTMNAME" property="btmname"/>
- <result column="LASTR" property="lastR"/>
- <result column="FIRSTR" property="firstR"/>
- <result column="LASTV" property="lastV"/>
- <result column="FIRSTV" property="firstV"/>
- <result column="CREATOR" property="creator"/>
- <result column="CREATETIME" property="createTime"/>
- <result column="LASTMODIFIER" property="lastModifier"/>
- <result column="LASTMODIFYTIME" property="lastModifyTime"/>
- <result column="REVISIONRULE" property="revisionRule"/>
- <result column="VERSIONRULE" property="versionRule"/>
- <result column="REVISIONSEQ" property="revisionSeq"/>
- <result column="REVISIONVALUE" property="revisionValue"/>
- <result column="VERSIONSEQ" property="versionSeq"/>
- <result column="VERSIONVALUE" property="versionValue"/>
- <result column="LCTID" property="lctid"/>
- <result column="LCSTATUS" property="lcStatus"/>
- <result column="TS" property="ts"/>
- <result column="ID" property="id"/>
- <result column="NAME" property="name"/>
- <result column="DESCRIPTION" property="description"/>
- <result column="OWNER" property="owner"/>
- <result column="COPYFROMVERSION" property="copyFromVersion"/>
- <result column="CODEPHASEOID" property="codePhaseOid"/>
- <result column="ATTRIBUTEGROUP" property="attributeGroup"/>
- </resultMap>
-
- <select id="selectCodePhaseattrPage" resultMap="CodePhaseattrResultMap">
- select * from PL_CODE_PHASEATTR where is_deleted = 0
- </select>
-
- <select id="selectByPhasea" resultMap="CodePhaseattrResultMap">
- select lastmodifier,
- revisionseq,
- versionvalue,
- description,
- oid,
- versionseq,
- revisionrule,
- lctid,
- id,
- owner,
- creator,
- createtime,
- firstv,
- attributegroup,
- revisionoid,
- btmname,
- revisionvalue,
- versionrule,
- name,
- lastr,
- lastmodifytime,
- copyfromversion,
- nameoid,
- lcstatus,
- lastv,
- codephaseoid,
- firstr
- from PL_CODE_PHASEATTR
- where codephaseoid in
- (select oid
- from PL_CODE_TEMPPHASE
- where codeClassifyTemplateOid = #{oid})
- </select>
-
- <select id="selectByPhaseaIds" resultMap="CodePhaseattrResultMap">
- select lastmodifier,
- revisionseq,
- versionvalue,
- description,
- oid,
- versionseq,
- checkinby,
- revisionrule,
- lctid,
- id,
- owner,
- checkoutby,
- creator,
- createtime,
- isfirstv,
- attributegroup,
- revisionoid,
- btmname,
- checkouttime,
- revisionvalue,
- versionrule,
- name,
- islastr,
- lastmodifytime,
- copyfromversion,
- nameoid,
- lcstatus,
- islastv,
- checkintime,
- codephaseoid,
- isfirstr
- from PL_CODE_PHASEATTR
- where codephaseoid in
- (#{oids})
- </select>
-
- <select id="listLinkAttrDOByTemplateAttrDOS" resultMap="CodePhaseattrResultMap">
-
- SELECT lastmodifier,
- revisionseq,
- versionvalue,
- description,
- oid,
- versionseq, /*checkinby,*/
- revisionrule,
- lctid,
- id,
- owner, /*checkoutby, */
- creator,
- createtime, /*is*/
- firstv,
- attributegroup,
- revisionoid,
- btmname, /*checkouttime,*/
- revisionvalue,
- versionrule,
- name, /*is*/
- lastr,
- lastmodifytime,
- copyfromversion,
- nameoid,
- lcstatus, /*is*/
- lastv, /*checkintime,*/
- codephaseoid,
- /*is*/
- firstr,
- ts
- FROM PL_CODE_PHASEATTR
- where ID IN (#{id})
- AND codephaseoid in
- (select oid
- from PL_CODE_TEMPPHASE
- where codeClassifyTemplateOid =#{codeClassifyTemplateOid})
- </select>
-
-</mapper>
--
Gitblit v1.9.3