Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
邬吉朋
ops
Commits
e410e003
Commit
e410e003
authored
Sep 03, 2024
by
wujipeng
Browse files
新增/删除合同
parent
98a1665d
Changes
7
Show whitespace changes
Inline
Side-by-side
src/main/java/com/ruzhoukj/sms/common/NumberConstant.java
0 → 100644
View file @
e410e003
package
com.ruzhoukj.sms.common
;
/**
* @author wujipeng
* @version 1.0
* @create 2024-06-06 9:16
*/
public
class
NumberConstant
{
public
static
final
Integer
ONE
=
1
;
public
static
final
Integer
ZERO
=
0
;
public
static
final
Integer
SIX
=
6
;
public
static
final
Integer
TWO
=
2
;
public
static
final
Integer
FIVE
=
5
;
public
static
final
Integer
FOUR
=
4
;
public
static
final
Integer
THREE
=
3
;
}
src/main/java/com/ruzhoukj/sms/controller/ContractController.java
View file @
e410e003
...
@@ -31,11 +31,23 @@ public class ContractController {
...
@@ -31,11 +31,23 @@ public class ContractController {
}
}
@ApiOperation
(
value
=
"查询一级合同下的合同列表"
)
@ApiOperation
(
value
=
"查询一级合同下的合同列表"
)
@
Pos
tMapping
(
"/list/{homId}"
)
@
Ge
tMapping
(
"/list/{homId}"
)
public
Result
listSecondLevel
(
@PathVariable
String
homId
)
{
public
Result
listSecondLevel
(
@PathVariable
String
homId
)
{
List
<
ContractVO
>
contractList
=
contractService
.
listSecondLevel
(
homId
);
List
<
ContractVO
>
contractList
=
contractService
.
listSecondLevel
(
homId
);
return
Result
.
success
(
contractList
);
return
Result
.
success
(
contractList
);
}
}
@ApiOperation
(
value
=
"新增"
)
@PostMapping
(
"/save"
)
public
Result
saveContract
(
@RequestBody
ContractDTO
contractDTO
)
{
return
Result
.
success
(
contractService
.
saveContract
(
contractDTO
));
}
@ApiOperation
(
value
=
"删除"
)
@GetMapping
(
"/delete/{id}"
)
public
Result
deleteContract
(
@PathVariable
String
id
)
{
return
Result
.
success
(
contractService
.
deleteContract
(
id
));
}
}
}
src/main/java/com/ruzhoukj/sms/dao/ContractDao.java
View file @
e410e003
...
@@ -33,4 +33,12 @@ public interface ContractDao extends BaseMapper<ContractEntity> {
...
@@ -33,4 +33,12 @@ public interface ContractDao extends BaseMapper<ContractEntity> {
* @return List<ContractVO>
* @return List<ContractVO>
*/
*/
List
<
ContractVO
>
listSecondLevel
(
@Param
(
"homId"
)
String
homId
);
List
<
ContractVO
>
listSecondLevel
(
@Param
(
"homId"
)
String
homId
);
/**
* 查询父级合同信息
*
* @param homId homId
* @return ContractVO
*/
ContractVO
selectParentContract
(
@Param
(
"homId"
)
String
homId
);
}
}
src/main/java/com/ruzhoukj/sms/entity/ContractEntity.java
View file @
e410e003
package
com.ruzhoukj.sms.entity
;
package
com.ruzhoukj.sms.entity
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.fasterxml.jackson.annotation.JsonInclude
;
import
com.fasterxml.jackson.annotation.JsonInclude
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
...
@@ -17,6 +19,8 @@ import java.util.Date;
...
@@ -17,6 +19,8 @@ import java.util.Date;
@TableName
(
"contract"
)
@TableName
(
"contract"
)
@JsonInclude
(
JsonInclude
.
Include
.
NON_NULL
)
@JsonInclude
(
JsonInclude
.
Include
.
NON_NULL
)
public
class
ContractEntity
{
public
class
ContractEntity
{
@TableId
(
type
=
IdType
.
AUTO
)
private
String
id
;
private
String
id
;
@ApiModelProperty
(
value
=
"父级合同id"
)
@ApiModelProperty
(
value
=
"父级合同id"
)
...
...
src/main/java/com/ruzhoukj/sms/service/ContractService.java
View file @
e410e003
...
@@ -29,4 +29,20 @@ public interface ContractService extends IService<ContractEntity> {
...
@@ -29,4 +29,20 @@ public interface ContractService extends IService<ContractEntity> {
* @return List<ContractVO>
* @return List<ContractVO>
*/
*/
List
<
ContractVO
>
listSecondLevel
(
String
homId
);
List
<
ContractVO
>
listSecondLevel
(
String
homId
);
/**
* 新增合同
*
* @param contractDTO contractDTO
* @return Boolean
*/
Boolean
saveContract
(
ContractDTO
contractDTO
);
/**
* 删除合同
*
* @param id id
* @return Boolean
*/
Boolean
deleteContract
(
String
id
);
}
}
src/main/java/com/ruzhoukj/sms/service/impl/ContractServiceImpl.java
View file @
e410e003
package
com.ruzhoukj.sms.service.impl
;
package
com.ruzhoukj.sms.service.impl
;
import
cn.hutool.core.bean.BeanUtil
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.github.pagehelper.page.PageMethod
;
import
com.github.pagehelper.page.PageMethod
;
import
com.ruzhoukj.sms.common.NumberConstant
;
import
com.ruzhoukj.sms.dao.ContractDao
;
import
com.ruzhoukj.sms.dao.ContractDao
;
import
com.ruzhoukj.sms.entity.ContractEntity
;
import
com.ruzhoukj.sms.entity.ContractEntity
;
import
com.ruzhoukj.sms.pojo.dto.ContractDTO
;
import
com.ruzhoukj.sms.pojo.dto.ContractDTO
;
...
@@ -12,6 +14,7 @@ import org.springframework.stereotype.Service;
...
@@ -12,6 +14,7 @@ import org.springframework.stereotype.Service;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
import
java.util.UUID
;
/**
/**
* @author wujipeng
* @author wujipeng
...
@@ -38,4 +41,38 @@ public class ContractServiceImpl extends ServiceImpl<ContractDao, ContractEntity
...
@@ -38,4 +41,38 @@ public class ContractServiceImpl extends ServiceImpl<ContractDao, ContractEntity
public
List
<
ContractVO
>
listSecondLevel
(
String
homId
)
{
public
List
<
ContractVO
>
listSecondLevel
(
String
homId
)
{
return
baseMapper
.
listSecondLevel
(
homId
);
return
baseMapper
.
listSecondLevel
(
homId
);
}
}
@Override
public
Boolean
saveContract
(
ContractDTO
contractDTO
)
{
//判断有没有一级合同
if
(
BeanUtil
.
isEmpty
(
contractDTO
.
getHomId
())
||
""
.
equals
(
contractDTO
.
getHomId
()))
{
String
homId
=
UUID
.
randomUUID
().
toString
();
contractDTO
.
setHomId
(
homId
);
}
else
{
//查询上一条合同
ContractVO
contractVO
=
baseMapper
.
selectParentContract
(
contractDTO
.
getHomId
());
//修改上一条合同
contractVO
.
setRenewContract
(
NumberConstant
.
ONE
);
contractVO
.
setRenewContractCode
(
contractDTO
.
getCode
());
baseMapper
.
updateById
(
BeanUtil
.
copyProperties
(
contractVO
,
ContractEntity
.
class
));
//保存续约新合同
contractDTO
.
setParentId
(
contractVO
.
getId
());
}
return
this
.
save
(
BeanUtil
.
copyProperties
(
contractDTO
,
ContractEntity
.
class
));
}
@Override
public
Boolean
deleteContract
(
String
id
)
{
//查询当前合同
ContractEntity
contractEntity
=
baseMapper
.
selectById
(
id
);
//判断有没有父级id
if
(
BeanUtil
.
isNotEmpty
(
contractEntity
.
getParentId
()))
{
//修改父级id信息
ContractEntity
parentContract
=
baseMapper
.
selectById
(
contractEntity
.
getParentId
());
parentContract
.
setRenewContract
(
NumberConstant
.
ZERO
);
parentContract
.
setRenewContractCode
(
""
);
baseMapper
.
updateById
(
parentContract
);
}
return
this
.
removeById
(
id
);
}
}
}
src/main/resources/com/ruzhoukj/sms/dao/ContractDao.xml
View file @
e410e003
...
@@ -42,4 +42,24 @@
...
@@ -42,4 +42,24 @@
begin_time
begin_time
asc
asc
</select>
</select>
<select
id=
"selectParentContract"
resultType=
"com.ruzhoukj.sms.pojo.vo.ContractVO"
>
select id,
parent_id as parentId,
hom_id as homId,
code,
client,
begin_time as beginTime,
end_time as endTime,
renew_contract as renewContract,
renew_contract_code as renewContractCode
from
contract
where
hom_id = #{homId}
order by
begin_time
desc
limit
1
</select>
</mapper>
</mapper>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment