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
1e1e4d16
Commit
1e1e4d16
authored
Jan 16, 2024
by
chenzhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加暂存待办及撤销待办
parent
e3a0dfbb
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
49 additions
and
22 deletions
+49
-22
JgChangeRegistrationUnitController.java
...jg/biz/controller/JgChangeRegistrationUnitController.java
+10
-1
CommonServiceImpl.java
...os/boot/module/jg/biz/service/impl/CommonServiceImpl.java
+0
-0
JgChangeRegistrationUnitServiceImpl.java
...biz/service/impl/JgChangeRegistrationUnitServiceImpl.java
+34
-21
urlInfo.json
...s-boot-module-jg-biz/src/main/resources/json/urlInfo.json
+5
-0
No files found.
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgChangeRegistrationUnitController.java
View file @
1e1e4d16
...
...
@@ -9,6 +9,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationUnitDto;
import
com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeDto
;
import
com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationUnit
;
import
com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice
;
import
com.yeejoin.amos.boot.module.jg.biz.service.impl.CommonServiceImpl
;
import
io.swagger.annotations.ApiParam
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
io.swagger.annotations.ApiOperation
;
...
...
@@ -51,6 +52,8 @@ public class JgChangeRegistrationUnitController extends BaseController {
@Autowired
JgChangeRegistrationUnitServiceImpl
jgChangeRegistrationUnitServiceImpl
;
@Autowired
CommonServiceImpl
commonService
;
/**
* 新增
...
...
@@ -94,6 +97,12 @@ public class JgChangeRegistrationUnitController extends BaseController {
@DeleteMapping
(
value
=
"/delete"
)
@ApiOperation
(
httpMethod
=
"DELETE"
,
value
=
"根据sequenceNbr删除单位变更"
,
notes
=
"根据sequenceNbr删除单位变更"
)
public
ResponseModel
<
Boolean
>
deleteBySequenceNbr
(
@RequestParam
(
value
=
"sequenceNbr"
)
Long
sequenceNbr
)
{
JgChangeRegistrationUnit
byId
=
jgChangeRegistrationUnitServiceImpl
.
getById
(
sequenceNbr
);
boolean
bool
=
jgChangeRegistrationUnitServiceImpl
.
removeById
(
sequenceNbr
);
if
(
bool
){
commonService
.
deleteTaskModel
(
sequenceNbr
+
""
);
commonService
.
deleteTaskModel
(
byId
.
getInstanceId
());
}
return
ResponseHelper
.
buildResponse
(
jgChangeRegistrationUnitServiceImpl
.
removeById
(
sequenceNbr
));
}
...
...
@@ -136,7 +145,7 @@ public class JgChangeRegistrationUnitController extends BaseController {
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@PostMapping
(
value
=
"/page"
)
@ApiOperation
(
httpMethod
=
"
GE
T"
,
value
=
"单位变更分页查询"
,
notes
=
"单位变更分页查询"
)
@ApiOperation
(
httpMethod
=
"
POS
T"
,
value
=
"单位变更分页查询"
,
notes
=
"单位变更分页查询"
)
public
ResponseModel
<
Page
<
JgChangeRegistrationUnitDto
>>
queryForPage
(
@ApiParam
(
value
=
"当前页码"
,
required
=
true
)
@RequestParam
(
value
=
"current"
,
defaultValue
=
"1"
)
int
current
,
@ApiParam
(
value
=
"每页大小"
,
required
=
true
)
@RequestParam
(
value
=
"size"
,
defaultValue
=
"20"
)
int
size
,
...
...
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CommonServiceImpl.java
View file @
1e1e4d16
This diff is collapsed.
Click to expand it.
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationUnitServiceImpl.java
View file @
1e1e4d16
...
...
@@ -255,6 +255,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
notice
.
setNextExecutorIds
(
String
.
join
(
","
,
roleListNext
));
notice
.
setStatus
(
WorkFlowStatusEnum
.
UNITCHANGE_RECEIVE
.
getPass
());
JgChangeRegistrationUnitMapper
.
updateById
(
notice
);
commonServiceImpl
.
deleteTaskModel
(
notice
.
getSequenceNbr
()+
""
);
createTaskModel
(
notice
,
taskname
,
"1"
,
nextUserIds
);
}
else
{
ArrayList
<
String
>
roleList
=
new
ArrayList
<>();
...
...
@@ -522,29 +523,41 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
JgChangeRegistrationUnitMapper
.
insertBatchSomeColumn
(
list
);
List
<
TaskModelDto
>
modelDtos
=
new
ArrayList
<>();
for
(
JgChangeRegistrationUnit
obj
:
list
)
{
TaskModelDto
dto
=
new
TaskModelDto
();
dto
.
setModel
(
obj
);
dto
.
setFlowCreateDate
(
new
Date
());
dto
.
setTaskName
(
workflowResultDtos
.
get
(
0
).
getNextTaskName
());
dto
.
setFlowCode
(
obj
.
getNextTaskId
());
dto
.
setTaskContent
(
"来自"
+
obj
.
getEquType
()+
"【"
+
obj
.
getSupervisoryCode
()+
"】的业务办理,【申请单号:"
+
obj
.
getApplyNo
()+
"】"
);
dto
.
setTaskCode
(
obj
.
getApplyNo
());
dto
.
setTaskType
(
BusinessTypeEnum
.
JG_COMPANY_CHANGE_REGISTRATION
.
getCode
());
dto
.
setTaskTypeLabel
(
BusinessTypeEnum
.
JG_COMPANY_CHANGE_REGISTRATION
.
getName
());
dto
.
setRelationId
(
obj
.
getInstanceId
());
dto
.
setExecuteUserIds
(
workflowResultDtos
.
get
(
0
).
getNextExecutorUserIds
());
dto
.
setTaskStatusLabel
(
"未处理"
);
dto
.
setFlowStatus
(
commonServiceImpl
.
getDictionaryCodeByName
(
WorkFlowStatusEnum
.
UNITCHANGE_RECEIVE
.
getPass
()));
dto
.
setFlowStatusLabel
(
WorkFlowStatusEnum
.
UNITCHANGE_RECEIVE
.
getPass
());
dto
.
setStartUserId
(
RequestContext
.
getExeUserId
());
dto
.
setStartUser
(
workflowResultDtos
.
get
(
0
).
getStartUserName
());
dto
.
setStartUserCompanyName
(
reginParams
.
getCompany
().
getCompanyName
());
dto
.
setStartDate
(
new
Date
());
dto
.
setNextExecuteUser
(
workflowResultDtos
.
get
(
0
).
getNextExecutorRoleIds
());
modelDtos
.
add
(
dto
);
if
(
SUBMIT_TYPE_FLOW
.
equals
(
submitType
))
{
for
(
JgChangeRegistrationUnit
obj
:
list
)
{
TaskModelDto
dto
=
new
TaskModelDto
();
dto
.
setModel
(
obj
);
dto
.
setFlowCreateDate
(
new
Date
());
dto
.
setTaskName
(
workflowResultDtos
.
get
(
0
).
getNextTaskName
());
dto
.
setFlowCode
(
obj
.
getNextTaskId
());
dto
.
setTaskContent
(
"来自"
+
obj
.
getEquType
()+
"【"
+
obj
.
getSupervisoryCode
()+
"】的业务办理,【申请单号:"
+
obj
.
getApplyNo
()+
"】"
);
dto
.
setTaskCode
(
obj
.
getApplyNo
());
dto
.
setTaskType
(
BusinessTypeEnum
.
JG_COMPANY_CHANGE_REGISTRATION
.
getCode
());
dto
.
setTaskTypeLabel
(
BusinessTypeEnum
.
JG_COMPANY_CHANGE_REGISTRATION
.
getName
());
dto
.
setRelationId
(
obj
.
getInstanceId
());
dto
.
setExecuteUserIds
(
workflowResultDtos
.
get
(
0
).
getNextExecutorUserIds
());
dto
.
setTaskStatusLabel
(
"未处理"
);
dto
.
setFlowStatus
(
commonServiceImpl
.
getDictionaryCodeByName
(
WorkFlowStatusEnum
.
UNITCHANGE_RECEIVE
.
getPass
()));
dto
.
setFlowStatusLabel
(
WorkFlowStatusEnum
.
UNITCHANGE_RECEIVE
.
getPass
());
dto
.
setStartUserId
(
RequestContext
.
getExeUserId
());
dto
.
setStartUser
(
workflowResultDtos
.
get
(
0
).
getStartUserName
());
dto
.
setStartUserCompanyName
(
reginParams
.
getCompany
().
getCompanyName
());
dto
.
setStartDate
(
new
Date
());
dto
.
setNextExecuteUser
(
workflowResultDtos
.
get
(
0
).
getNextExecutorRoleIds
());
modelDtos
.
add
(
dto
);
}
}
else
{
for
(
JgChangeRegistrationUnit
obj
:
list
)
{
TaskModelDto
dto
=
new
TaskModelDto
();
dto
.
setModel
(
obj
);
dto
.
setTaskCode
(
obj
.
getApplyNo
());
dto
.
setTaskType
(
BusinessTypeEnum
.
JG_COMPANY_CHANGE_REGISTRATION
.
getCode
());
dto
.
setRelationId
(
obj
.
getSequenceNbr
()+
""
);
modelDtos
.
add
(
dto
);
}
}
commonServiceImpl
.
buildTaskModel
(
modelDtos
);
...
...
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/urlInfo.json
View file @
1e1e4d16
...
...
@@ -102,6 +102,11 @@
"url"
:
"/mixuap?appId=1742358052905971713&id=1738095060211232770&roleIds={roleIds}&userId={userId}&pageType=edit"
},
{
"type"
:
"109"
,
"pageType"
:
"draft"
,
"name"
:
"单位变更登记"
,
"url"
:
"/mixuap?appId=1742358052905971713&id=1738018156141637633&roleIds={roleIds}&userId={userId}&pageType=edit"
},
{
"type"
:
"110"
,
"pageType"
:
"look"
,
"name"
:
"移装变更登记"
,
...
...
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