Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
383c7130
Commit
383c7130
authored
Dec 08, 2022
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
收入生成打标修改
parent
f9402c13
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
49 additions
and
7 deletions
+49
-7
TSettleDomainListVo.java
...u/cloud/plus/v1/yifu/archives/vo/TSettleDomainListVo.java
+4
-0
TSettleDomainController.java
.../v1/yifu/archives/controller/TSettleDomainController.java
+16
-3
TSettleDomainMapper.java
...oud/plus/v1/yifu/archives/mapper/TSettleDomainMapper.java
+2
-0
TSettleDomainService.java
...d/plus/v1/yifu/archives/service/TSettleDomainService.java
+3
-4
TSettleDomainServiceImpl.java
.../yifu/archives/service/impl/TSettleDomainServiceImpl.java
+10
-0
TSettleDomainMapper.xml
...ves-biz/src/main/resources/mapper/TSettleDomainMapper.xml
+14
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TSettleDomainListVo.java
View file @
383c7130
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain
;
import
lombok.Data
;
import
lombok.Data
;
import
java.util.List
;
import
java.util.List
;
...
@@ -14,6 +15,9 @@ public class TSettleDomainListVo {
...
@@ -14,6 +15,9 @@ public class TSettleDomainListVo {
private
List
<
TSettleDomainSelectVo
>
listSelectVO
;
private
List
<
TSettleDomainSelectVo
>
listSelectVO
;
private
Map
<
String
,
TSettleDomainSelectVo
>
mapSlectVo
;
private
Map
<
String
,
TSettleDomainSelectVo
>
mapSlectVo
;
private
Map
<
String
,
TSettleDomain
>
mapVO
;
/**
/**
* 合同主体IDS
* 合同主体IDS
*/
*/
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TSettleDomainController.java
View file @
383c7130
...
@@ -22,7 +22,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
...
@@ -22,7 +22,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TCustomerInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TDepartSettlementInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TDepartSettlementInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TDepartSettlementInfoService
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TDepartSettlementInfoService
;
...
@@ -42,7 +41,6 @@ import org.springframework.web.bind.annotation.*;
...
@@ -42,7 +41,6 @@ import org.springframework.web.bind.annotation.*;
import
java.io.UnsupportedEncodingException
;
import
java.io.UnsupportedEncodingException
;
import
java.net.URLDecoder
;
import
java.net.URLDecoder
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
...
@@ -229,6 +227,21 @@ public class TSettleDomainController {
...
@@ -229,6 +227,21 @@ public class TSettleDomainController {
return
tSettleDomainService
.
getSetInfoByCodes
(
codes
);
return
tSettleDomainService
.
getSetInfoByCodes
(
codes
);
}
}
/**
* @Author fxj
* @Description 通过项目编码获取项目及客户信息
* @Date 10:49 2022/7/20
* @Param
* @return
**/
@Operation
(
description
=
"通过项目编码获取项目及客户信息"
)
@SysLog
(
"通过项目编码获取项目及客户信息"
)
@Inner
@PostMapping
(
"/getSettleInfoByCodes"
)
public
TSettleDomainListVo
getSettleInfoByCodes
(
@RequestBody
List
<
String
>
codes
)
{
return
tSettleDomainService
.
getSettleInfoByCodes
(
codes
);
}
/**
/**
* @param id 项目主键
* @param id 项目主键
* @Description: 通过id获取结算主体及单位部分信息
* @Description: 通过id获取结算主体及单位部分信息
...
@@ -267,7 +280,7 @@ public class TSettleDomainController {
...
@@ -267,7 +280,7 @@ public class TSettleDomainController {
/**
/**
* 修改项目表--EKP调用接口
* 修改项目表--EKP调用接口
* @author hyc
* @author hyc
* @param
list
项目表
* @param
jsonStr
项目表
* @return R
* @return R
*/
*/
@Operation
(
summary
=
"修改项目表--EKP调用接口"
,
description
=
"修改项目表--EKP调用接口"
)
@Operation
(
summary
=
"修改项目表--EKP调用接口"
,
description
=
"修改项目表--EKP调用接口"
)
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TSettleDomainMapper.java
View file @
383c7130
...
@@ -74,4 +74,6 @@ public interface TSettleDomainMapper extends BaseMapper<TSettleDomain> {
...
@@ -74,4 +74,6 @@ public interface TSettleDomainMapper extends BaseMapper<TSettleDomain> {
* @return
* @return
**/
**/
List
<
ProjectSetInfoVo
>
getSetInfoByCodes
(
@Param
(
value
=
"codes"
)
List
<
String
>
codes
);
List
<
ProjectSetInfoVo
>
getSetInfoByCodes
(
@Param
(
value
=
"codes"
)
List
<
String
>
codes
);
List
<
TSettleDomain
>
getSettleInfoByCodes
(
@Param
(
value
=
"codes"
)
List
<
String
>
codes
);
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TSettleDomainService.java
View file @
383c7130
...
@@ -21,10 +21,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
...
@@ -21,10 +21,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.IdNameNoVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.SetInfoVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainEkpVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
...
@@ -64,6 +61,8 @@ public interface TSettleDomainService extends IService<TSettleDomain> {
...
@@ -64,6 +61,8 @@ public interface TSettleDomainService extends IService<TSettleDomain> {
SetInfoVo
getSetInfoByCodes
(
List
<
String
>
codes
);
SetInfoVo
getSetInfoByCodes
(
List
<
String
>
codes
);
TSettleDomainListVo
getSettleInfoByCodes
(
List
<
String
>
codes
);
/**
/**
* 通过id获取项目及单位部分信息
* 通过id获取项目及单位部分信息
* @param
* @param
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TSettleDomainServiceImpl.java
View file @
383c7130
...
@@ -323,6 +323,16 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
...
@@ -323,6 +323,16 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
return
setMap
;
return
setMap
;
}
}
@Override
public
TSettleDomainListVo
getSettleInfoByCodes
(
List
<
String
>
codes
)
{
List
<
TSettleDomain
>
voList
=
baseMapper
.
getSettleInfoByCodes
(
codes
);
TSettleDomainListVo
setMap
=
new
TSettleDomainListVo
();
if
(
Common
.
isNotNull
(
voList
)){
setMap
.
setMapVO
(
voList
.
stream
().
collect
(
Collectors
.
toMap
(
TSettleDomain:
:
getDepartNo
,
k
->
k
)));
}
return
setMap
;
}
/**
/**
* @Author fxj
* @Author fxj
* @Description 更新EKP对应MVP 项目权限,已有权限不做删除处理
* @Description 更新EKP对应MVP 项目权限,已有权限不做删除处理
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TSettleDomainMapper.xml
View file @
383c7130
...
@@ -297,4 +297,18 @@
...
@@ -297,4 +297,18 @@
</if>
</if>
</select>
</select>
<select
id=
"getSettleInfoByCodes"
resultMap=
"tSettleDomainMap"
>
SELECT
<include
refid=
"Base_Column_List"
/>
FROM t_settle_domain a
where 1=1
and a.DELETE_FLAG = '0'
<if
test=
"codes != null and codes.size() > 0"
>
and a.DEPART_NO in
<foreach
collection=
"codes"
item=
"param"
index=
"index"
open=
"("
close=
")"
separator=
","
>
#{param}
</foreach>
</if>
</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