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
b6fd3a96
Commit
b6fd3a96
authored
Dec 25, 2023
by
litengwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
使用单位变更
parent
797c9245
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
103 additions
and
50 deletions
+103
-50
BizCustomDateSerializer.java
...os/boot/module/jg/api/common/BizCustomDateSerializer.java
+1
-1
JgChangeRegistrationUnitDto.java
...s/boot/module/jg/api/dto/JgChangeRegistrationUnitDto.java
+4
-0
JgChangeRegistrationUnit.java
...s/boot/module/jg/api/entity/JgChangeRegistrationUnit.java
+4
-0
WorkFlowStatusEnum.java
...oin/amos/boot/module/jg/api/enums/WorkFlowStatusEnum.java
+1
-1
JgChangeRegistrationUnitMapper.xml
.../main/resources/mapper/JgChangeRegistrationUnitMapper.xml
+15
-13
JgChangeRegistrationUnitController.java
...jg/biz/controller/JgChangeRegistrationUnitController.java
+8
-10
JgChangeRegistrationUnitServiceImpl.java
...biz/service/impl/JgChangeRegistrationUnitServiceImpl.java
+70
-25
No files found.
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/common/BizCustomDateSerializer.java
View file @
b6fd3a96
...
...
@@ -30,7 +30,7 @@ import java.util.Objects;
*/
public
class
BizCustomDateSerializer
extends
JsonSerializer
<
Date
>
{
private
List
<
String
>
customFields
=
Arrays
.
asList
(
"acceptDate"
,
"expiryDate"
,
"applicationDate"
,
"noticeDate"
,
"installStartDate"
,
"handleDate"
);
private
List
<
String
>
customFields
=
Arrays
.
asList
(
"acceptDate"
,
"expiryDate"
,
"applicationDate"
,
"noticeDate"
,
"installStartDate"
,
"handleDate"
,
"auditPassDate"
,
"applyDate"
);
public
BizCustomDateSerializer
()
{
...
...
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgChangeRegistrationUnitDto.java
View file @
b6fd3a96
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jg
.
api
.
dto
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.fasterxml.jackson.databind.annotation.JsonSerialize
;
import
com.yeejoin.amos.boot.module.jg.api.common.BizCustomDateSerializer
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
com.yeejoin.amos.boot.biz.common.dto.BaseDto
;
...
...
@@ -31,6 +33,7 @@ public class JgChangeRegistrationUnitDto extends BaseDto {
private
String
applyNo
;
@ApiModelProperty
(
value
=
"申请日期"
)
@JsonSerialize
(
using
=
BizCustomDateSerializer
.
class
)
private
Date
applyDate
;
@ApiModelProperty
(
value
=
"办理状态"
)
...
...
@@ -46,6 +49,7 @@ public class JgChangeRegistrationUnitDto extends BaseDto {
private
String
receiveCompanyCode
;
@ApiModelProperty
(
value
=
"终审通过时间"
)
@JsonSerialize
(
using
=
BizCustomDateSerializer
.
class
)
private
Date
auditPassDate
;
@ApiModelProperty
(
value
=
"备注"
)
...
...
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgChangeRegistrationUnit.java
View file @
b6fd3a96
...
...
@@ -2,7 +2,9 @@ package com.yeejoin.amos.boot.module.jg.api.entity;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.fasterxml.jackson.databind.annotation.JsonSerialize
;
import
com.yeejoin.amos.boot.biz.common.entity.BaseEntity
;
import
com.yeejoin.amos.boot.module.jg.api.common.BizCustomDateSerializer
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.experimental.Accessors
;
...
...
@@ -38,6 +40,7 @@ public class JgChangeRegistrationUnit extends BaseEntity {
* 申请日期
*/
@TableField
(
"apply_date"
)
@JsonSerialize
(
using
=
BizCustomDateSerializer
.
class
)
private
Date
applyDate
;
/**
...
...
@@ -68,6 +71,7 @@ public class JgChangeRegistrationUnit extends BaseEntity {
* 终审通过时间
*/
@TableField
(
"audit_pass_date"
)
@JsonSerialize
(
using
=
BizCustomDateSerializer
.
class
)
private
Date
auditPassDate
;
/**
...
...
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/WorkFlowStatusEnum.java
View file @
b6fd3a96
...
...
@@ -59,7 +59,7 @@ public enum WorkFlowStatusEnum {
/**
* 使用单位更登记流程
*/
UNITCHANGE_SUBMIT
(
"使用单位提交"
,
"unitChangeSubmit"
,
"使用单位待提交"
,
"一级受理已驳回"
,
"使用单位
提交
已撤回"
),
UNITCHANGE_SUBMIT
(
"使用单位提交"
,
"unitChangeSubmit"
,
"使用单位待提交"
,
"一级受理已驳回"
,
"使用单位已撤回"
),
UNITCHANGE_RECEIVE
(
"一级受理"
,
"unitChangeReceive"
,
"一级待受理"
,
"二级受理已驳回"
,
"一级受理已撤回"
),
UNITCHANGE_PRELIMINARY
(
"二级受理"
,
"unitChangePreliminary"
,
"二级待受理"
,
"三级受理已驳回"
,
"二级受理已撤回"
),
UNITCHANGE_REEXAMINE
(
"三级受理"
,
"unitChangeReexamine"
,
"三级待受理"
,
""
,
""
);
...
...
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgChangeRegistrationUnitMapper.xml
View file @
b6fd3a96
...
...
@@ -10,11 +10,16 @@
isn.use_unit_name AS useUnitName,
isn.receive_org_name AS receiveOrgName,
isn.new_use_unit_name AS newUseUnitName,
isn.equ_address AS equAddress,
isn.product_name_b AS productNameB,
isn.equ_code_b AS equCodeB,
isn.use_inner_code AS useInnerCode,
isn.use_regist_code AS useRegistCode,
isn.apply_date AS applyDate,
isn.status AS status,
isn.instance_id AS instanceId,
isn.promoter,
isn.next_execut
e_ids AS nextExecute
Ids,
isn.next_execut
or_ids AS nextExecutor
Ids,
isn.instance_status AS instanceStatus,
isn.audit_pass_date AS auditPassDate,
isn.equ_type AS equType
...
...
@@ -27,17 +32,20 @@
AND isn.apply_no LIKE CONCAT('%', #{param.applyNo}, '%')
</if>
<if
test=
"param.receiveOrgCode != null and param.receiveOrgCode != ''"
>
AND isn.receive_org_c
redit_code = #{param.receiveOrgCredit
Code}
AND isn.receive_org_c
ode = #{param.receiveOrg
Code}
</if>
<if
test=
"param.useUnitName != null and param.useUnitName != ''"
>
AND isn.use_unit_c
redit_c
ode = #{param.useUnitName}
AND isn.use_unit_code = #{param.useUnitName}
</if>
<if
test=
"param.status != null and param.status != ''"
>
AND isn.status = #{param.status}
</if>
<if
test=
"param.equCodeB != null and param.equCodeB != ''"
>
AND isn.equ_code_b = #{param.equCodeB}
</if>
</if>
<if
test=
"type == 'supervision'"
>
AND isn.receive_org_c
redit_c
ode = #{orgCode}
AND isn.receive_org_code = #{orgCode}
AND isn.instance_id is not null
</if>
<if
test=
"type == 'enterprise'"
>
...
...
@@ -50,22 +58,16 @@
</if>
</where>
ORDER BY
isn.create_date DESC
isn.create_date
,isn.apply_no
DESC
</select>
<select
id=
"queryEquipInformation"
resultType=
"java.util.Map"
>
select
isn.sequence_nbr AS sequenceNbr,
isn.apply_no AS applyNo,
isn.use_unit_name AS useUnitName,
isn.use_unit_credit_code AS useUnitName,
isn.new_use_unit_credit_code AS useUnitName,
isn.new_use_unit_name AS useUnitName,
isn.receive_org_name AS receiveOrgName,
isn.receive_org_code AS receiveOrgCode,
isn.change_certificate AS changeCertificate,
isn.remark AS remark,
isn.
equ_register
_code AS equRegisterCode,
isn.
use_regist
_code AS equRegisterCode,
ri.equ_list AS equList,
ri.equ_category AS equCategory,
ri.EQU_DEFINE AS equDefine,
...
...
@@ -99,7 +101,7 @@
ei.address AS address
FROM
tzs_jg_change_registration_unit isn
LEFT JOIN tzs_jg_change_registration_unit_eq re ON re.
equip_transfer
_id = isn.sequence_nbr
LEFT JOIN tzs_jg_change_registration_unit_eq re ON re.
unit_change_registration
_id = isn.sequence_nbr
LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
LEFT JOIN idx_biz_jg_design_info di ON di.record = re.equ_id
LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id
...
...
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 @
b6fd3a96
...
...
@@ -70,15 +70,13 @@ public class JgChangeRegistrationUnitController extends BaseController {
@PutMapping
(
value
=
"/update"
)
@ApiOperation
(
httpMethod
=
"PUT"
,
value
=
"根据sequenceNbr更新单位变更"
,
notes
=
"根据sequenceNbr更新单位变更"
)
public
ResponseModel
<
JgChangeRegistrationUnitDto
>
updateBySequenceNbrJgInstallationNotice
(
@RequestParam
String
submitType
,
@RequestBody
Map
<
String
,
Object
>
model
,
@RequestParam
(
value
=
"op"
,
required
=
false
)
String
op
)
{
JgChangeRegistrationUnitDto
installationInf
o
=
BeanUtil
.
mapToBean
(((
LinkedHashMap
)
model
.
get
(
"changeRegisInfo"
)),
JgChangeRegistrationUnitDto
.
class
,
true
);
if
(
Objects
.
isNull
(
installationInf
o
))
{
JgChangeRegistrationUnitDto
jgChangeRegistrationUnitDt
o
=
BeanUtil
.
mapToBean
(((
LinkedHashMap
)
model
.
get
(
"changeRegisInfo"
)),
JgChangeRegistrationUnitDto
.
class
,
true
);
if
(
Objects
.
isNull
(
jgChangeRegistrationUnitDt
o
))
{
throw
new
IllegalArgumentException
(
"参数installationInfo不能为空"
);
}
// Object o = ((LinkedHashMap<?, ?>) model.get("installationInfo")).get("proxyStatementAttachment");
// Object o1 = ((LinkedHashMap<?, ?>) model.get("installationInfo")).get("installContractAttachment");
// installationInfo.setProxyStatementAttachmentList((List<Map<String, Object>>) o);
// installationInfo.setInstallContractAttachmentList((List<Map<String, Object>>) o1);
return
ResponseHelper
.
buildResponse
(
jgChangeRegistrationUnitServiceImpl
.
updateInstallationNotice
(
submitType
,
installationInfo
,
op
));
Object
o
=
((
LinkedHashMap
<?,
?>)
model
.
get
(
"changeRegisInfo"
)).
get
(
"changeCertificateList"
);
jgChangeRegistrationUnitDto
.
setChangeCertificateList
((
List
<
Map
<
String
,
Object
>>)
o
);
return
ResponseHelper
.
buildResponse
(
jgChangeRegistrationUnitServiceImpl
.
updateInstallationNotice
(
submitType
,
jgChangeRegistrationUnitDto
,
op
));
}
/**
...
...
@@ -163,7 +161,7 @@ public class JgChangeRegistrationUnitController extends BaseController {
@PostMapping
(
value
=
"/cancel"
)
@ApiOperation
(
httpMethod
=
"POST"
,
value
=
"单位变更撤销"
,
notes
=
"单位变更撤销"
)
public
ResponseModel
<
JgChangeRegistrationUnitDto
>
cancel
(
@RequestBody
Map
<
String
,
Object
>
model
)
{
JgChangeRegistrationUnitDto
installationInfo
=
BeanUtil
.
mapToBean
(((
LinkedHashMap
)
model
.
get
(
"
installation
Info"
)),
JgChangeRegistrationUnitDto
.
class
,
true
);
JgChangeRegistrationUnitDto
installationInfo
=
BeanUtil
.
mapToBean
(((
LinkedHashMap
)
model
.
get
(
"
changeRegis
Info"
)),
JgChangeRegistrationUnitDto
.
class
,
true
);
if
(
Objects
.
isNull
(
installationInfo
))
{
throw
new
IllegalArgumentException
(
"参数installationInfo不能为空"
);
}
...
...
@@ -181,9 +179,9 @@ public class JgChangeRegistrationUnitController extends BaseController {
@ApiOperation
(
httpMethod
=
"POST"
,
value
=
"单位变更受理"
,
notes
=
"单位变更受理"
)
public
ResponseModel
<
JgChangeRegistrationUnitDto
>
accept
(
@RequestBody
Map
<
String
,
Object
>
model
,
String
op
)
{
// TODO 受理单位变更流程
LinkedHashMap
model1
=
(
LinkedHashMap
)
model
.
get
(
"
model
"
);
LinkedHashMap
model1
=
(
LinkedHashMap
)
model
.
get
(
"
changeRegisInfo
"
);
String
opinion
=
(
String
)
model
.
get
(
"opinion"
);
LinkedHashMap
installationInfo
=
(
LinkedHashMap
)
model1
.
get
(
"
installation
Info"
);
LinkedHashMap
installationInfo
=
(
LinkedHashMap
)
model1
.
get
(
"
changeRegis
Info"
);
JgChangeRegistrationUnitDto
jgInstallationNoticeDto
=
JSON
.
parseObject
(
JSON
.
toJSONString
(
installationInfo
),
JgChangeRegistrationUnitDto
.
class
);
jgInstallationNoticeDto
.
setProcessAdvice
(
opinion
);
jgChangeRegistrationUnitServiceImpl
.
accept
(
jgInstallationNoticeDto
,
op
);
...
...
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 @
b6fd3a96
...
...
@@ -12,9 +12,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationUnitDto;
import
com.yeejoin.amos.boot.module.jg.api.entity.*
;
import
com.yeejoin.amos.boot.module.jg.api.enums.EquipTypeEnum
;
import
com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum
;
import
com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeRegistrationUnitMapper
;
import
com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeRegistrationUnitEqMapper
;
import
com.yeejoin.amos.boot.module.jg.api.mapper.JgRegistrationHistoryMapper
;
import
com.yeejoin.amos.boot.module.jg.api.mapper.*
;
import
com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationUnitService
;
import
com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient
;
import
com.yeejoin.amos.boot.module.jg.biz.utils.ImageUtils
;
...
...
@@ -98,6 +96,22 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
@Autowired
private
IdxBizJgRegisterInfoMapper
idxBizJgRegisterInfoMapper
;
//改造登记关系表mapper
@Autowired
private
JgChangeRegistrationReformEqMapper
jgChangeRegistrationReformEqMapper
;
//移装登记关系表
@Autowired
private
JgChangeRegistrationTransferEqMapper
jgChangeRegistrationTransferEqMapper
;
//使用登记关系表mapper
@Autowired
private
JgUseRegistrationEqMapper
jgUseRegistrationEqMapper
;
//单位变更登记关系表mapper
@Autowired
private
JgChangeRegistrationUnitEqMapper
jgChangeRegistrationUnitEqMapper
;
//更名变更登记关系表mapper
@Autowired
private
JgChangeRegistrationNameEqMapper
jgChangeRegistrationNameEqMapper
;
...
...
@@ -139,11 +153,11 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
if
(!
ValidationUtil
.
isEmpty
(
notice
.
getNewUseUnitCreditCode
())
&&
!
ValidationUtil
.
isEmpty
(
notice
.
getNewUseUnitName
()))
{
changeInfo
.
put
(
"newUseUnitCreditCode"
,
notice
.
getNewUseUnitCreditCode
()
+
"_"
+
notice
.
getNewUseUnitName
());
}
changeInfo
.
put
(
"changeCertificateList"
,
notice
.
getChangeCertificate
());
String
[]
fields
=
{
"productPhoto"
,
"designDoc"
,
"designStandard"
,
"factoryStandard"
,
"productQualityYieldProve"
,
"insUseMaintainExplain"
,
"inspectReport"
,
"proxyStatementAttachment"
,
"installContractAttachment"
,
"changeCertificate"
};
"proxyStatementAttachment"
,
"installContractAttachment"
,
"changeCertificate
List
"
};
// 设备信息
List
<
Map
<
String
,
Object
>>
equipmentInfos
=
JgChangeRegistrationUnitMapper
.
queryEquipInformation
(
sequenceNbr
);
...
...
@@ -162,7 +176,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
newMap
.
putAll
(
equipmentInfos
.
get
(
0
));
return
new
HashMap
<
String
,
Map
<
String
,
Object
>>()
{{
this
.
put
(
"changeInfo"
,
newMap
);
this
.
put
(
"change
Regis
Info"
,
newMap
);
}};
}
...
...
@@ -493,6 +507,10 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
dto
.
setNewUseUnitName
(
reginParams
.
getCompany
().
getCompanyName
());
dto
.
setNewUseUnitCreditCode
(
reginParams
.
getCompany
().
getCompanyCode
());
dto
.
setEquType
((
String
.
valueOf
(
obj
.
get
(
"EQU_CATEGORY"
))));
dto
.
setProductNameB
((
String
.
valueOf
(
obj
.
get
(
"PRODUCT_NAME"
))));
dto
.
setEquCodeB
((
String
.
valueOf
(
obj
.
get
(
"EQU_CODE"
))));
dto
.
setUseInnerCode
((
String
.
valueOf
(
obj
.
get
(
"USE_INNER_CODE"
))));
dto
.
setEquAddress
((
String
.
valueOf
(
obj
.
get
(
"ADDRESS"
))));
jgRelationEquip
.
setEquId
(
String
.
valueOf
(
obj
.
get
(
"SEQUENCE_NBR"
)));
jgRelationEquip
.
setUnitChangeRegistrationId
(
applyNo
);
...
...
@@ -585,13 +603,16 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
//修改数据
jgRegistrationHistory
.
setChangeData
(
JSONObject
.
toJSONString
(
map
));
//设备监管码
// jgRegistrationHistory.setSupervisoryCode(supervisoryCode);
LambdaQueryWrapper
<
OtherInfo
>
queryWrapper1
=
new
LambdaQueryWrapper
<>();
queryWrapper1
.
eq
(
OtherInfo:
:
getRecord
,
equipId
);
OtherInfo
tzsJgOtherInfo
=
tzsJgOtherInfoMapper
.
selectOne
(
queryWrapper1
);
jgRegistrationHistory
.
setSupervisoryCode
(
tzsJgOtherInfo
.
getSupervisoryCode
());
if
(
map
.
containsKey
(
"type"
)
&&
"edit"
.
equals
(
String
.
valueOf
(
map
.
get
(
"type"
))))
{
jgRegistrationHistory
.
setSequenceNbr
(
jgRegistrationHistoryMapper
.
getSequenceNbrByEquidAndDocumentId
(
equipId
,
String
.
valueOf
(
map
.
get
(
"sequenceNbr"
))));
jgRegistrationHistoryMapper
.
updateById
(
jgRegistrationHistory
);
}
else
{
//当前单据id
jgRegistrationHistory
.
setCurrentDocumentId
(
map
.
get
(
"
sequenceNbr
"
).
toString
());
jgRegistrationHistory
.
setCurrentDocumentId
(
map
.
get
(
"
applyNo
"
).
toString
());
jgRegistrationHistoryMapper
.
insert
(
jgRegistrationHistory
);
}
}
...
...
@@ -644,17 +665,18 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
public
void
accept
(
JgChangeRegistrationUnitDto
dto
,
String
op
)
{
String
[]
taskName
=
new
String
[]{
"已完成"
};
String
userId
=
RequestContext
.
getExeUserId
();
JgChangeRegistrationUnit
J
gChangeRegistrationUnit
=
this
.
JgChangeRegistrationUnitMapper
.
selectById
(
dto
.
getSequenceNbr
());
J
gChangeRegistrationUnit
.
setProcessAdvice
(
dto
.
getProcessAdvice
());
JgChangeRegistrationUnit
j
gChangeRegistrationUnit
=
this
.
JgChangeRegistrationUnitMapper
.
selectById
(
dto
.
getSequenceNbr
());
j
gChangeRegistrationUnit
.
setProcessAdvice
(
dto
.
getProcessAdvice
());
ArrayList
<
String
>
roleList
=
new
ArrayList
<>();
boolean
submit
=
submit
(
J
gChangeRegistrationUnit
,
op
);
boolean
submit
=
submit
(
j
gChangeRegistrationUnit
,
op
);
if
(
submit
)
{
getNext
(
roleList
,
dto
.
getInstanceId
(),
taskName
);
J
gChangeRegistrationUnit
.
setStatus
(
taskName
[
0
]);
j
gChangeRegistrationUnit
.
setStatus
(
taskName
[
0
]);
if
(
"0"
.
equals
(
op
))
{
if
(
roleList
.
size
()
==
0
)
{
JgChangeRegistrationUnit
.
setStatus
(
WorkFlowStatusEnum
.
getMessage
(
taskName
[
0
]).
getPass
());
jgChangeRegistrationUnit
.
setStatus
(
taskName
[
0
]);
jgChangeRegistrationUnit
.
setAuditPassDate
(
new
Date
());
// 生成新的使用登记编号,使用登记证 修改设备的使用登记信息表,使用单位名称,使用单位统一信用代码,使用登记证编号,更新ES
LambdaQueryWrapper
<
JgChangeRegistrationUnitEq
>
queryWrapper
=
new
LambdaQueryWrapper
<>();
...
...
@@ -668,8 +690,8 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
LambdaQueryWrapper
<
UseInfo
>
queryWrapper2
=
new
LambdaQueryWrapper
<>();
queryWrapper2
.
eq
(
UseInfo:
:
getRecord
,
jgChangeRegistrationUnitEq
.
getEquId
());
UseInfo
useInfo
=
useInfoMapper
.
selectOne
(
queryWrapper2
);
useInfo
.
setUseUnitName
(
J
gChangeRegistrationUnit
.
getNewUseUnitName
());
useInfo
.
setUseUnitCreditCode
(
J
gChangeRegistrationUnit
.
getNewUseUnitCreditCode
());
useInfo
.
setUseUnitName
(
j
gChangeRegistrationUnit
.
getNewUseUnitName
());
useInfo
.
setUseUnitCreditCode
(
j
gChangeRegistrationUnit
.
getNewUseUnitCreditCode
());
String
code
=
getCode
(
tzsJgOtherInfo
.
getSupervisoryCode
());
...
...
@@ -678,6 +700,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
return
;
}
jgChangeRegistrationUnit
.
setUseRegistCode
(
code
);
//更新使用注册登记证编号
idxBizJgRegisterInfoMapper
.
updateUseOrgCodeByEquip
(
equipId
,
code
);
useInfoMapper
.
updateById
(
useInfo
);
...
...
@@ -685,9 +708,12 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
Map
<
String
,
Map
<
String
,
Object
>>
resultMap
=
new
HashMap
<>();
Map
<
String
,
Object
>
map1
=
new
HashMap
<>();
map1
.
put
(
"USE_ORG_CODE"
,
code
);
map1
.
put
(
"USE_UNIT_CREDIT_CODE"
,
jgChangeRegistrationUnit
.
getNewUseUnitCreditCode
());
map1
.
put
(
"USE_UNIT_NAME"
,
jgChangeRegistrationUnit
.
getNewUseUnitName
());
resultMap
.
put
(
equipId
,
map1
);
tzsServiceFeignClient
.
commonUpdateEsDataByIds
(
resultMap
);
//修改各类告知列表,置为废弃
this
.
updataInvalidStatusByHistory
(
jgChangeRegistrationUnitEq
.
getEquId
(),
jgChangeRegistrationUnit
.
getApplyNo
());
// TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
// @Override
...
...
@@ -696,21 +722,40 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
// }
// });
}
else
{
J
gChangeRegistrationUnit
.
setNextExecutorIds
(
String
.
join
(
","
,
roleList
));
if
(!
ObjectUtils
.
isEmpty
(
J
gChangeRegistrationUnit
.
getInstanceStatus
()))
{
JgChangeRegistrationUnit
.
setInstanceStatus
(
J
gChangeRegistrationUnit
.
getInstanceStatus
()
+
","
+
String
.
join
(
","
,
roleList
));
j
gChangeRegistrationUnit
.
setNextExecutorIds
(
String
.
join
(
","
,
roleList
));
if
(!
ObjectUtils
.
isEmpty
(
j
gChangeRegistrationUnit
.
getInstanceStatus
()))
{
jgChangeRegistrationUnit
.
setInstanceStatus
(
j
gChangeRegistrationUnit
.
getInstanceStatus
()
+
","
+
String
.
join
(
","
,
roleList
));
}
else
{
J
gChangeRegistrationUnit
.
setInstanceStatus
(
String
.
join
(
","
,
roleList
));
j
gChangeRegistrationUnit
.
setInstanceStatus
(
String
.
join
(
","
,
roleList
));
}
J
gChangeRegistrationUnit
.
setPromoter
(
userId
);
J
gChangeRegistrationUnit
.
setStatus
(
WorkFlowStatusEnum
.
getMessage
(
taskName
[
0
]).
getPass
());
j
gChangeRegistrationUnit
.
setPromoter
(
userId
);
j
gChangeRegistrationUnit
.
setStatus
(
WorkFlowStatusEnum
.
getMessage
(
taskName
[
0
]).
getPass
());
}
}
else
{
JgChangeRegistrationUnit
.
setPromoter
(
""
);
JgChangeRegistrationUnit
.
setStatus
(
WorkFlowStatusEnum
.
getMessage
(
taskName
[
0
]).
getReject
());
jgChangeRegistrationUnit
.
setPromoter
(
""
);
jgChangeRegistrationUnit
.
setStatus
(
WorkFlowStatusEnum
.
getMessage
(
taskName
[
0
]).
getReject
());
}
JgChangeRegistrationUnitMapper
.
updateById
(
jgChangeRegistrationUnit
);
}
JgChangeRegistrationUnitMapper
.
updateById
(
JgChangeRegistrationUnit
);
}
/**
* 修改各类告知列表,置为废弃
*
* @param equId 设备id
* @param equipTransferId 当前告知单Id
*/
public
void
updataInvalidStatusByHistory
(
String
equId
,
String
equipTransferId
)
{
//改造变更登记
jgChangeRegistrationReformEqMapper
.
updateEquipIsVaildByEquipIdAndCurrentDocumentId
(
equId
,
equipTransferId
);
//移装变更登记
jgChangeRegistrationTransferEqMapper
.
updateEquipIsVaildByEquipIdAndCurrentDocumentId
(
equId
,
equipTransferId
);
//使用登记
jgUseRegistrationEqMapper
.
updateEquipIsVaildByEquipIdAndCurrentDocumentId
(
equId
,
equipTransferId
);
//单位变更登记
jgChangeRegistrationUnitEqMapper
.
updateEquipIsVaildByEquipIdAndCurrentDocumentId
(
equId
,
equipTransferId
);
//更名变更登记
jgChangeRegistrationNameEqMapper
.
updateEquipIsVaildByEquipIdAndCurrentDocumentId
(
equId
,
equipTransferId
);
}
...
...
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