Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
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
项目统一框架
amos-boot-biz
Commits
69cab5f3
Commit
69cab5f3
authored
Mar 20, 2023
by
tianyiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改总览
parent
06613fbd
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
23 deletions
+6
-23
EquipmentCategoryMapper.xml
...api/src/main/resources/mapper/EquipmentCategoryMapper.xml
+6
-3
EquipmentCategoryServiceImpl.java
...le/tzs/biz/service/impl/EquipmentCategoryServiceImpl.java
+0
-3
equipStatus.json
...t-module-tzs-biz/src/main/resources/json/equipStatus.json
+0
-17
No files found.
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/resources/mapper/EquipmentCategoryMapper.xml
View file @
69cab5f3
...
...
@@ -13,7 +13,8 @@
LEFT JOIN tz_equipment_category tec ON ibjri.EQU_CATEGORY = tec.code
LEFT JOIN tz_equipment_category tec1 ON ibjri.EQU_LIST = tec1.code
WHERE
ibjoi.claim_status = '待认领' AND ibjri."EQU_LIST" = #{code}
/*6036代表待认领*/
ibjoi.claim_status = '6036' AND ibjri."EQU_LIST" = #{code}
<if
test=
"level == 'company'"
>
AND ibjui."USE_UNIT_CREDIT_CODE"
LIKE CONCAT('%',#{orgCode},'%')
...
...
@@ -33,7 +34,8 @@
LEFT JOIN tz_equipment_category tec ON ibjri.EQU_CATEGORY = tec.code
LEFT JOIN tz_equipment_category tec1 ON ibjri.EQU_LIST = tec1.code
WHERE
ibjoi.claim_status = '已认领' AND ibjri."EQU_LIST" = #{code}
/**6035代表待认领*/
ibjoi.claim_status = '6035' AND ibjri."EQU_LIST" = #{code}
<if
test=
"level == 'company'"
>
AND ibjui."USE_UNIT_CREDIT_CODE"
LIKE CONCAT('%',#{orgCode},'%')
...
...
@@ -53,7 +55,8 @@
LEFT JOIN tz_equipment_category tec ON ibjri.EQU_CATEGORY = tec.code
LEFT JOIN tz_equipment_category tec1 ON ibjri.EQU_LIST = tec1.code
WHERE
ibjoi.claim_status = '已拒领' AND ibjri."EQU_LIST" = #{code}
/**6037代表待认领*/
ibjoi.claim_status = '6037' AND ibjri."EQU_LIST" = #{code}
<if
test=
"level == 'company'"
>
AND ibjui."USE_UNIT_CREDIT_CODE"
LIKE CONCAT('%',#{orgCode},'%')
...
...
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/EquipmentCategoryServiceImpl.java
View file @
69cab5f3
...
...
@@ -46,9 +46,6 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
@Value
(
"classpath:/json/equipCategory.json"
)
private
Resource
equipCategory
;
@Value
(
"classpath:/json/equipStatus.json"
)
private
Resource
equipStatus
;
@Autowired
CategoryOtherInfoMapper
categoryOtherInfoMapper
;
...
...
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/json/equipStatus.json
deleted
100644 → 0
View file @
06613fbd
{
"rlzt"
:
[
{
"name"
:
"待认领"
,
"value"
:
"waitClaim"
},
{
"name"
:
"已认领"
,
"value"
:
"alreadyClaim"
},
{
"name"
:
"拒领"
,
"value"
:
"refuseClaim"
}
]
}
\ No newline at end of file
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