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
1b8e3b3b
Commit
1b8e3b3b
authored
Dec 20, 2023
by
caotao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
改造登记后端代码初版提交
parent
372a120b
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
506 additions
and
78 deletions
+506
-78
JgChangeRegistrationReformDto.java
...boot/module/jg/api/dto/JgChangeRegistrationReformDto.java
+2
-2
JgChangeRegistrationReform.java
...boot/module/jg/api/entity/JgChangeRegistrationReform.java
+12
-7
JgChangeRegistrationReformMapper.java
...odule/jg/api/mapper/JgChangeRegistrationReformMapper.java
+16
-0
JgChangeRegistrationReformMapper.xml
...ain/resources/mapper/JgChangeRegistrationReformMapper.xml
+135
-0
JgChangeRegistrationReformController.java
.../biz/controller/JgChangeRegistrationReformController.java
+75
-62
JgChangeRegistrationReformServiceImpl.java
...z/service/impl/JgChangeRegistrationReformServiceImpl.java
+266
-7
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/dto/JgChangeRegistrationReformDto.java
View file @
1b8e3b3b
...
@@ -100,12 +100,12 @@ public class JgChangeRegistrationReformDto extends BaseDto {
...
@@ -100,12 +100,12 @@ public class JgChangeRegistrationReformDto extends BaseDto {
private
String
receiveCompanyCode
;
private
String
receiveCompanyCode
;
@ApiModelProperty
(
value
=
"下一执行节点ids"
)
@ApiModelProperty
(
value
=
"下一执行节点ids"
)
private
String
nextExecut
or
Ids
;
private
String
nextExecut
e
Ids
;
@ApiModelProperty
(
value
=
"改造告知申请id"
)
@ApiModelProperty
(
value
=
"改造告知申请id"
)
private
String
reformNoticeId
;
private
String
reformNoticeId
;
@ApiModelProperty
(
value
=
"任务发起人id"
)
@ApiModelProperty
(
value
=
"任务发起人id"
)
private
String
executorUserId
;
private
String
promoter
;
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgChangeRegistrationReform.java
View file @
1b8e3b3b
...
@@ -178,11 +178,6 @@ public class JgChangeRegistrationReform extends BaseEntity {
...
@@ -178,11 +178,6 @@ public class JgChangeRegistrationReform extends BaseEntity {
@TableField
(
"receive_company_code"
)
@TableField
(
"receive_company_code"
)
private
String
receiveCompanyCode
;
private
String
receiveCompanyCode
;
/**
* 下一执行节点ids
*/
@TableField
(
"next_executor_ids"
)
private
String
nextExecutorIds
;
/**
/**
* 改造告知申请id
* 改造告知申请id
...
@@ -190,10 +185,20 @@ public class JgChangeRegistrationReform extends BaseEntity {
...
@@ -190,10 +185,20 @@ public class JgChangeRegistrationReform extends BaseEntity {
@TableField
(
"reform_notice_id"
)
@TableField
(
"reform_notice_id"
)
private
String
reformNoticeId
;
private
String
reformNoticeId
;
@TableField
(
"instance_status"
)
private
String
instanceStatus
;
/**
* 下一执行节点ids
*/
@TableField
(
"next_execute_ids"
)
private
String
nextExecuteIds
;
/**
/**
* 任务发起人id
* 任务发起人id
*/
*/
@TableField
(
"executor_user_id
"
)
@TableField
(
value
=
"promoter
"
)
private
String
executorUserId
;
private
String
promoter
;
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgChangeRegistrationReformMapper.java
View file @
1b8e3b3b
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jg
.
api
.
mapper
;
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jg
.
api
.
mapper
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto
;
import
com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReform
;
import
com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReform
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
import
java.util.Map
;
/**
/**
* 改造变更登记 Mapper 接口
* 改造变更登记 Mapper 接口
...
@@ -10,5 +16,15 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
...
@@ -10,5 +16,15 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @date 2023-12-20
* @date 2023-12-20
*/
*/
public
interface
JgChangeRegistrationReformMapper
extends
BaseMapper
<
JgChangeRegistrationReform
>
{
public
interface
JgChangeRegistrationReformMapper
extends
BaseMapper
<
JgChangeRegistrationReform
>
{
Page
<
Map
<
String
,
Object
>>
getListPage
(
@Param
(
"page"
)
Page
<
Map
<
String
,
Object
>>
page
,
@Param
(
"dto"
)
JgUseRegistrationDto
dto
,
@Param
(
"roleIds"
)
List
<
String
>
roleIds
);
Map
<
String
,
Object
>
getDetail
(
@Param
(
"id"
)
String
id
);
Map
<
String
,
Object
>
getInspectDetail
(
@Param
(
"id"
)
String
id
);
Map
<
String
,
Object
>
getUseDetail
(
@Param
(
"id"
)
String
id
);
Page
<
Map
<
String
,
Object
>>
getEquipListPage
(
@Param
(
"page"
)
Page
<
Map
<
String
,
Object
>>
page
,
@Param
(
"factoryNum"
)
String
factoryNum
,
@Param
(
"equList"
)
String
equList
,
@Param
(
"equCategory"
)
String
equCategory
);
void
updatePromoter
(
@Param
(
"id"
)
Long
id
);
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgChangeRegistrationReformMapper.xml
View file @
1b8e3b3b
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeRegistrationReformMapper"
>
<mapper
namespace=
"com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeRegistrationReformMapper"
>
<update
id=
"updatePromoter"
>
UPDATE tzs_jg_change_registration_reform set promoter = null
where sequence_nbr = #{id}
</update>
<select
id=
"getListPage"
resultType=
"java.util.Map"
>
select ur.sequence_nbr as sequenceNbr,
ur.audit_status as auditStatus,
ur.reg_date as regDate,
ur.use_unit_name as useUnitName,
ur.status,
ur.receive_org_name as receiveOrgName,
(SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
jri.PRODUCT_NAME as productName,
jri.EQU_CODE as equCode,
use.USE_INNER_CODE as innerCode,
concat(use.PROVINCE_NAME,'-',use.CITY_NAME,'-',use.COUNTY_NAME) as place,
ur.instance_id as instanceId,
re.equ_id as equipId,
ur.apply_no as applyNo,
ifnull(ur.next_execute_ids,'') as nextExecuteIds,
ur.promoter
from tzs_jg_change_registration_reform ur
LEFT JOIN tzs_jg_change_registration_reform_eq re on ur.sequence_nbr = re.equip_transfer_id
LEFT JOIN idx_biz_jg_register_info jri on re.equ_id = jri.RECORD
LEFT JOIN idx_biz_jg_use_info use on re.equ_id = use.RECORD
<where>
and ur.is_delete = 0
<if
test=
"dto.equCategory != null and dto.equCategory != ''"
>
and jri.EQU_CATEGORY = #{dto.equCategory}
</if>
<if
test=
"dto.auditStatus != null and dto.auditStatus != ''"
>
and ur.audit_status = #{dto.auditStatus}
</if>
<if
test=
"dto.equCode != null and dto.equCode != ''"
>
and jri.EQU_CODE like concat('%',#{dto.equCode},'%')
</if>
<if
test=
"dto.useUnitName != null and dto.useUnitName != ''"
>
and ur.use_unit_name like concat('%',#{dto.useUnitName},'%')
</if>
<if
test=
"roleIds != null and dto.dataType == 'jg'"
>
<foreach
collection=
'roleIds'
item=
'role'
open=
'and ('
close=
')'
separator=
'or'
>
instance_status like concat('%',#{role},'%')
</foreach>
</if>
<if
test=
"dto.dataType == 'jg' "
>
and ur.receive_company_code = #{dto.unitCode}
</if>
<if
test=
"dto.dataType == 'company' "
>
and ur.use_unit_credit_code = #{dto.unitCode}
</if>
</where>
order by ur.rec_date desc
</select>
<select
id=
"getDetail"
resultType=
"java.util.Map"
>
SELECT jri.EQU_CODE as equCode,
-- (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
-- (SELECT name from tz_equipment_category where code = jri.EQU_LIST) as equList,
-- (SELECT name from tz_equipment_category where code = jri.EQU_DEFINE) as equDefine,
jri.EQU_CATEGORY as equCategory,
jri.EQU_LIST as equList,
jri.EQU_DEFINE as equDefine,
jri.PRODUCT_NAME as productName,
jri.EQU_TYPE as equType,
jri.PRODUCT_PHOTO as proDuctPhoto,
jfi.FACTORY_NUM as factoryNum,
jfi.PRODUCE_UNIT_NAME as produceUnitName,
jfi.PRODUCE_DATE as produceDate,
jfi.FACTORY_STANDARD as factoryStandard,
jfi.PRODUCT_QUALITY_YIELD_PROVE as productQualityYieldProve,
jfi.INS_USE_MAINTAIN_EXPLAIN as insUseMaintainExplanin,
jci.USC_UNIT_NAME as uscUnitName,
jci.USC_UNIT_CREDIT_CODE as uscUnitCreditCode
from idx_biz_jg_register_info jri
LEFT JOIN idx_biz_jg_factory_info jfi on jri.RECORD = jfi.RECORD
LEFT JOIN idx_biz_jg_construction_info jci on jri.RECORD = jci.RECORD
where jri.RECORD = #{id}
</select>
<select
id=
"getInspectDetail"
resultType=
"java.util.Map"
>
SELECT INSPECT_TYPE as inspectType,
INSPECT_STAFF as inspctStaff,
INSPECT_CONCLUSION as inspectConclusion,
INSPECT_ORG_NAME as inspectOrgName,
INSPECT_DATE as inspectDate,
NEXT_INSPECT_DATE as nextInspectDate,
INSPECT_REPORT as inspectReport
from idx_biz_jg_inspection_detection_info
where RECORD = #{id}
ORDER BY INSPECT_DATE desc LIMIT 1
</select>
<select
id=
"getUseDetail"
resultType=
"java.util.Map"
>
SELECT USE_UNIT_NAME as useUnitName,
USE_UNIT_CREDIT_CODE as useUnitCreditCode,
USE_PLACE as usePlace,
SAFETY_MANAGER as safetyManager,
PHONE as phone,
ESTATE_UNIT_NAME as estateUnitName,
ESTATE_UNIT_CREDIT_CODE as estateUnitCreditCode,
ADDRESS as address,
PROVINCE as province,
CITY as city,
COUNTY as county,
USE_INNER_CODE as useInnerCode
FROM "idx_biz_jg_use_info" where RECORD = #{id}
</select>
<select
id=
"getEquipListPage"
resultType=
"java.util.Map"
>
SELECT jri.EQU_CODE as equCode,
jri.RECORD as id,
(SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
(SELECT name from tz_equipment_category where code = jri.EQU_LIST) as equList,
jfi.FACTORY_NUM as factoryNum,
jui.ADDRESS as address,
jui.USE_INNER_CODE as useInnerCode,
jfi.PRODUCE_UNIT_NAME as produceUnitName
from idx_biz_jg_register_info jri
LEFT JOIN idx_biz_jg_factory_info jfi on jri.RECORD = jfi.RECORD
LEFT JOIN idx_biz_jg_use_info jui on jri.RECORD = jui.RECORD
<where>
<if
test=
"factoryNum != null and factoryNum != ''"
>
and jfi.FACTORY_NUM like concat('%',#{factoryNum},'%')
</if>
<if
test=
"equList != null and equList != ''"
>
and jri.EQU_LIST like concat('%',#{equList},'%')
</if>
<if
test=
"equCategory != null and equCategory != ''"
>
and jri.EQU_CATEGORY like concat('%',#{equCategory},'%')
</if>
</where>
</select>
</mapper>
</mapper>
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgChangeRegistrationReformController.java
View file @
1b8e3b3b
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jg
.
biz
.
controller
;
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jg
.
biz
.
controller
;
import
com.alibaba.fastjson.JSONObject
;
import
com.yeejoin.amos.boot.biz.common.bo.ReginParams
;
import
com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.yeejoin.amos.boot.biz.common.controller.BaseController
;
import
com.yeejoin.amos.boot.biz.common.controller.BaseController
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeRegistrationReformServiceImpl
;
import
com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeRegistrationReformServiceImpl
;
import
org.typroject.tyboot.core.restful.utils.ResponseHelper
;
import
org.typroject.tyboot.core.restful.utils.ResponseHelper
;
import
org.typroject.tyboot.core.restful.utils.ResponseModel
;
import
org.typroject.tyboot.core.restful.utils.ResponseModel
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
javax.servlet.http.HttpServletRequest
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationReformDto
;
import
org.typroject.tyboot.core.restful.doc.TycloudOperation
;
import
org.typroject.tyboot.core.restful.doc.TycloudOperation
;
import
org.typroject.tyboot.core.foundation.enumeration.UserType
;
import
org.typroject.tyboot.core.foundation.enumeration.UserType
;
...
@@ -39,78 +45,85 @@ public class JgChangeRegistrationReformController extends BaseController {
...
@@ -39,78 +45,85 @@ public class JgChangeRegistrationReformController extends BaseController {
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@PostMapping
(
value
=
"/save"
)
@PostMapping
(
value
=
"/save"
)
@ApiOperation
(
httpMethod
=
"POST"
,
value
=
"新增改造变更登记"
,
notes
=
"新增改造变更登记"
)
@ApiOperation
(
httpMethod
=
"POST"
,
value
=
"新增改造变更登记"
,
notes
=
"新增改造变更登记"
)
public
ResponseModel
<
JgChangeRegistrationReformDto
>
save
(
@RequestBody
JgChangeRegistrationReformDto
model
)
{
public
ResponseModel
<
Object
>
save
(
@RequestBody
JSONObject
map
)
{
model
=
jgChangeRegistrationReformServiceImpl
.
createWithModel
(
model
);
jgChangeRegistrationReformServiceImpl
.
save
(
map
);
return
ResponseHelper
.
buildResponse
(
model
);
return
ResponseHelper
.
buildResponse
(
"ok"
);
}
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@PostMapping
(
value
=
"/flowExecute"
)
@ApiOperation
(
httpMethod
=
"POST"
,
value
=
"执行流程"
,
notes
=
"执行流程"
)
public
ResponseModel
<
Object
>
flowExecute
(
@RequestBody
JSONObject
map
)
{
jgChangeRegistrationReformServiceImpl
.
flowExecute
(
Long
.
valueOf
(
String
.
valueOf
(
map
.
get
(
"sequenceNbr"
))),
String
.
valueOf
(
map
.
get
(
"instanceId"
)),
String
.
valueOf
(
map
.
get
(
"operate"
)),
String
.
valueOf
(
map
.
get
(
"comment"
)),
true
);
return
ResponseHelper
.
buildResponse
(
"ok"
);
}
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@PostMapping
(
value
=
"/withdraw"
)
@ApiOperation
(
httpMethod
=
"POST"
,
value
=
"撤回"
,
notes
=
"撤回"
)
public
ResponseModel
<
Object
>
withdraw
(
@RequestBody
JSONObject
map
)
{
jgChangeRegistrationReformServiceImpl
.
withdraw
(
String
.
valueOf
(
map
.
get
(
"instanceId"
)));
return
ResponseHelper
.
buildResponse
(
"ok"
);
}
}
/**
* 根据sequenceNbr更新
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@PutMapping
(
value
=
"/{sequenceNbr}"
)
@PostMapping
(
value
=
"/deleteBatch"
)
@ApiOperation
(
httpMethod
=
"PUT"
,
value
=
"根据sequenceNbr更新改造变更登记"
,
notes
=
"根据sequenceNbr更新改造变更登记"
)
@ApiOperation
(
httpMethod
=
"POST"
,
value
=
"批量删除"
,
notes
=
"批量删除"
)
public
ResponseModel
<
JgChangeRegistrationReformDto
>
updateBySequenceNbrJgChangeRegistrationReform
(
@RequestBody
JgChangeRegistrationReformDto
model
,
@PathVariable
(
value
=
"sequenceNbr"
)
Long
sequenceNbr
)
{
public
ResponseModel
<
Object
>
deleteBatch
(
@RequestBody
JSONObject
map
)
{
model
.
setSequenceNbr
(
sequenceNbr
);
List
<
Long
>
ids
=
(
List
<
Long
>)
map
.
get
(
"ids"
);
return
ResponseHelper
.
buildResponse
(
jgChangeRegistrationReformServiceImpl
.
updateWithModel
(
model
));
jgChangeRegistrationReformServiceImpl
.
deleteBatch
(
ids
);
return
ResponseHelper
.
buildResponse
(
"ok"
);
}
}
/**
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
* 根据sequenceNbr删除
@PostMapping
(
value
=
"/deleteMessage"
)
*
@ApiOperation
(
httpMethod
=
"POST"
,
value
=
"批量删除"
,
notes
=
"批量删除"
)
* @param sequenceNbr 主键
public
ResponseModel
<
Object
>
deleteMessage
(
@RequestParam
(
"id"
)
Long
id
)
{
* @return
ArrayList
<
Long
>
ids
=
new
ArrayList
<>();
*/
ids
.
add
(
id
);
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
jgChangeRegistrationReformServiceImpl
.
deleteBatch
(
ids
);
@DeleteMapping
(
value
=
"/{sequenceNbr}"
)
return
ResponseHelper
.
buildResponse
(
"ok"
);
@ApiOperation
(
httpMethod
=
"DELETE"
,
value
=
"根据sequenceNbr删除改造变更登记"
,
notes
=
"根据sequenceNbr删除改造变更登记"
)
}
public
ResponseModel
<
Boolean
>
deleteBySequenceNbr
(
HttpServletRequest
request
,
@PathVariable
(
value
=
"sequenceNbr"
)
Long
sequenceNbr
){
return
ResponseHelper
.
buildResponse
(
jgChangeRegistrationReformServiceImpl
.
removeById
(
sequenceNbr
));
}
/**
* 根据sequenceNbr查询
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@GetMapping
(
value
=
"/{sequenceNbr}"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"列表全部数据查询"
,
notes
=
"列表全部数据查询"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"根据sequenceNbr查询单个改造变更登记"
,
notes
=
"根据sequenceNbr查询单个改造变更登记"
)
@GetMapping
(
value
=
"/getList"
)
public
ResponseModel
<
JgChangeRegistrationReformDto
>
selectOne
(
@PathVariable
Long
sequenceNbr
)
{
public
ResponseModel
<
Page
<
Map
<
String
,
Object
>>>
getList
(
JgUseRegistrationDto
dto
,
return
ResponseHelper
.
buildResponse
(
jgChangeRegistrationReformServiceImpl
.
queryBySeq
(
sequenceNbr
));
@RequestParam
(
value
=
"current"
)
int
current
,
@RequestParam
(
value
=
"size"
)
int
size
)
{
Page
<
Map
<
String
,
Object
>>
page
=
new
Page
<>(
current
,
size
);
return
ResponseHelper
.
buildResponse
(
jgChangeRegistrationReformServiceImpl
.
getList
(
dto
,
page
,
dto
.
getRoleIds
()));
}
}
/**
* 列表分页查询
*
* @param current 当前页
* @param current 每页大小
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@GetMapping
(
value
=
"/page"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"列表全部数据查询"
,
notes
=
"列表全部数据查询"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"改造变更登记分页查询"
,
notes
=
"改造变更登记分页查询"
)
@GetMapping
(
value
=
"/getEquipList"
)
public
ResponseModel
<
Page
<
JgChangeRegistrationReformDto
>>
queryForPage
(
@RequestParam
(
value
=
"current"
)
int
current
,
@RequestParam
public
ResponseModel
<
Page
<
Map
<
String
,
Object
>>>
getEquipList
(
(
value
=
"size"
)
int
size
)
{
@RequestParam
(
value
=
"current"
)
int
current
,
Page
<
JgChangeRegistrationReformDto
>
page
=
new
Page
<
JgChangeRegistrationReformDto
>();
@RequestParam
(
value
=
"size"
)
int
size
,
page
.
setCurrent
(
current
);
@RequestParam
(
value
=
"factoryNum"
,
required
=
false
)
String
factoryNum
,
page
.
setSize
(
size
);
@RequestParam
(
value
=
"equList"
,
required
=
false
)
String
equList
,
return
ResponseHelper
.
buildResponse
(
jgChangeRegistrationReformServiceImpl
.
queryForJgChangeRegistrationReformPage
(
page
));
@RequestParam
(
value
=
"equCategory"
,
required
=
false
)
String
equCategory
)
{
Page
<
Map
<
String
,
Object
>>
page
=
new
Page
<>(
current
,
size
);
return
ResponseHelper
.
buildResponse
(
jgChangeRegistrationReformServiceImpl
.
getEquipList
(
page
,
factoryNum
,
equList
,
equCategory
));
}
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"列表全部数据查询"
,
notes
=
"列表全部数据查询"
)
@GetMapping
(
value
=
"/getDetail"
)
public
ResponseModel
<
Map
<
String
,
Object
>>
getDetail
(
@RequestParam
(
"id"
)
String
id
)
{
return
ResponseHelper
.
buildResponse
(
jgChangeRegistrationReformServiceImpl
.
getDetail
(
id
));
}
}
/**
* 列表全部数据查询
*
* @return
*/
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"改造变更登记列表全部数据查询"
,
notes
=
"改造变更登记列表全部数据查询"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"列表全部数据查询"
,
notes
=
"列表全部数据查询"
)
@GetMapping
(
value
=
"/list"
)
@GetMapping
(
value
=
"/getMessage"
)
public
ResponseModel
<
List
<
JgChangeRegistrationReformDto
>>
selectForList
()
{
public
ResponseModel
<
Map
<
String
,
Object
>>
getMessage
()
{
return
ResponseHelper
.
buildResponse
(
jgChangeRegistrationReformServiceImpl
.
queryForJgChangeRegistrationReformList
());
ReginParams
selectedOrgInfo
=
getSelectedOrgInfo
();
HashMap
<
String
,
Object
>
map
=
new
HashMap
<>();
map
.
put
(
"useUnitCreditCode"
,
selectedOrgInfo
.
getCompany
().
getCompanyCode
());
map
.
put
(
"useUnitName"
,
selectedOrgInfo
.
getCompany
().
getCompanyName
());
return
ResponseHelper
.
buildResponse
(
map
);
}
}
}
}
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/JgChangeRegistrationReformServiceImpl.java
View file @
1b8e3b3b
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jg
.
biz
.
service
.
impl
;
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jg
.
biz
.
service
.
impl
;
import
cn.hutool.core.bean.BeanUtil
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONArray
;
import
com.alibaba.fastjson.JSONObject
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.yeejoin.amos.boot.biz.common.bo.ReginParams
;
import
com.yeejoin.amos.boot.biz.common.utils.RedisKey
;
import
com.yeejoin.amos.boot.biz.common.utils.RedisUtils
;
import
com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto
;
import
com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReform
;
import
com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReform
;
import
com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration
;
import
com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationEq
;
import
com.yeejoin.amos.boot.module.jg.api.enums.UseStatusEnum
;
import
com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeRegistrationReformMapper
;
import
com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeRegistrationReformMapper
;
import
com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationEqMapper
;
import
com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationReformService
;
import
com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationReformService
;
import
com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationReformDto
;
import
com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationReformDto
;
import
com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService
;
import
com.yeejoin.amos.boot.module.ymt.api.entity.InspectionDetectionInfo
;
import
com.yeejoin.amos.boot.module.ymt.api.entity.OtherInfo
;
import
com.yeejoin.amos.boot.module.ymt.api.entity.UseInfo
;
import
com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum
;
import
com.yeejoin.amos.boot.module.ymt.api.mapper.InspectionDetectionInfoMapper
;
import
com.yeejoin.amos.boot.module.ymt.api.mapper.OtherInfoMapper
;
import
com.yeejoin.amos.boot.module.ymt.api.mapper.UseInfoMapper
;
import
com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService
;
import
com.yeejoin.amos.feign.workflow.Workflow
;
import
com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO
;
import
com.yeejoin.amos.feign.workflow.model.AjaxResult
;
import
com.yeejoin.amos.feign.workflow.model.TaskResultDTO
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.util.ObjectUtils
;
import
org.typroject.tyboot.core.foundation.context.RequestContext
;
import
org.typroject.tyboot.core.rdbms.service.BaseService
;
import
org.typroject.tyboot.core.rdbms.service.BaseService
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
/**
/**
* 改造变更登记服务实现类
* 改造变更登记服务实现类
...
@@ -17,17 +52,240 @@ import java.util.List;
...
@@ -17,17 +52,240 @@ import java.util.List;
*/
*/
@Service
@Service
public
class
JgChangeRegistrationReformServiceImpl
extends
BaseService
<
JgChangeRegistrationReformDto
,
JgChangeRegistrationReform
,
JgChangeRegistrationReformMapper
>
implements
IJgChangeRegistrationReformService
{
public
class
JgChangeRegistrationReformServiceImpl
extends
BaseService
<
JgChangeRegistrationReformDto
,
JgChangeRegistrationReform
,
JgChangeRegistrationReformMapper
>
implements
IJgChangeRegistrationReformService
{
@Autowired
private
UseInfoMapper
useInfoMapper
;
@Autowired
private
InspectionDetectionInfoMapper
inspectionDetectionInfoMapper
;
@Autowired
private
OtherInfoMapper
otherInfoMapper
;
@Autowired
private
JgChangeRegistrationReformMapper
jgChangeRegistrationReformMapper
;
@Autowired
WorkFlowFeignService
workFlowFeginService
;
@Autowired
private
ICreateCodeService
iCreateCodeService
;
@Autowired
RedisUtils
redisUtils
;
/**
/**
* 分页查询
* 分页查询
*/
*/
public
Page
<
JgChangeRegistrationReformDto
>
queryForJgChangeRegistrationReformPage
(
Page
<
JgChangeRegistrationReformDto
>
page
)
{
public
Page
<
Map
<
String
,
Object
>>
getList
(
JgUseRegistrationDto
dto
,
Page
<
Map
<
String
,
Object
>>
page
,
List
<
String
>
roleIds
)
{
return
this
.
queryForPage
(
page
,
null
,
false
);
Page
<
Map
<
String
,
Object
>>
listPage
=
this
.
baseMapper
.
getListPage
(
page
,
dto
,
roleIds
);
return
listPage
;
}
}
/**
public
Page
<
Map
<
String
,
Object
>>
getEquipList
(
Page
<
Map
<
String
,
Object
>>
page
,
String
factoryNum
,
String
equList
,
String
equCategory
)
{
* 列表查询 示例
return
this
.
baseMapper
.
getEquipListPage
(
page
,
factoryNum
,
equList
,
equCategory
);
*/
}
public
List
<
JgChangeRegistrationReformDto
>
queryForJgChangeRegistrationReformList
()
{
@Transactional
return
this
.
queryForList
(
""
,
false
);
public
void
save
(
JSONObject
map
)
{
UseInfo
useInfo
=
new
UseInfo
();
BeanUtil
.
copyProperties
(
map
,
useInfo
);
LambdaQueryWrapper
<
UseInfo
>
lambda
=
new
QueryWrapper
<
UseInfo
>().
lambda
();
lambda
.
eq
(
UseInfo:
:
getRecord
,
map
.
get
(
"equipId"
));
// 更新使用信息
useInfoMapper
.
update
(
useInfo
,
lambda
);
InspectionDetectionInfo
inspectionDetectionInfo
=
new
InspectionDetectionInfo
();
BeanUtil
.
copyProperties
(
map
,
inspectionDetectionInfo
);
LambdaQueryWrapper
<
InspectionDetectionInfo
>
inspectionLambda
=
new
QueryWrapper
<
InspectionDetectionInfo
>().
lambda
();
inspectionLambda
.
eq
(
InspectionDetectionInfo:
:
getRecord
,
map
.
get
(
"equipId"
));
// 更新检验检测信息
inspectionDetectionInfoMapper
.
update
(
inspectionDetectionInfo
,
inspectionLambda
);
// 使用登记信息
JgChangeRegistrationReform
jgChangeRegistrationReform
=
new
JgChangeRegistrationReform
();
LambdaQueryWrapper
<
OtherInfo
>
otherLambda
=
new
QueryWrapper
<
OtherInfo
>().
lambda
();
otherLambda
.
eq
(
OtherInfo:
:
getRecord
,
map
.
get
(
"equipId"
));
OtherInfo
otherInfo
=
otherInfoMapper
.
selectOne
(
otherLambda
);
String
supervisoryCode
=
otherInfo
.
getSupervisoryCode
();
jgChangeRegistrationReform
.
setSupervisoryCode
(
supervisoryCode
);
jgChangeRegistrationReform
.
setUseUnitName
(
useInfo
.
getUseUnitName
());
jgChangeRegistrationReform
.
setUseUnitCreditCode
(
useInfo
.
getUseUnitCreditCode
());
jgChangeRegistrationReform
.
setInspectUnitCreditCode
(
map
.
get
(
"inspectUnitCreditCode"
).
toString
());
jgChangeRegistrationReform
.
setInspectUnitName
(
map
.
get
(
"inspectOrgName"
).
toString
());
if
(
map
.
containsKey
(
"type"
)
&&
"edit"
.
equals
(
String
.
valueOf
(
map
.
get
(
"type"
))))
{
jgChangeRegistrationReform
.
setUseUnitCreditCode
(
null
);
jgChangeRegistrationReform
.
setSequenceNbr
(
Long
.
valueOf
(
String
.
valueOf
(
map
.
get
(
"sequenceNbr"
))));
this
.
getBaseMapper
().
updateById
(
jgChangeRegistrationReform
);
}
else
{
// 业务管理设备信息保存
JgUseRegistrationEq
jgRelationEquip
=
new
JgUseRegistrationEq
();
jgRelationEquip
.
setEquId
(
map
.
get
(
"equipId"
).
toString
());
// jgRelationEquip.setBusinessType(String.valueOf(BusinessTypeEnum.USAGE_REGISTRATION.getCode()));
List
<
String
>
applicationFormCode
=
iCreateCodeService
.
createApplicationFormCode
(
ApplicationFormTypeEnum
.
SYDJ
.
getCode
(),
1
);
jgChangeRegistrationReform
.
setApplyNo
(
applicationFormCode
.
get
(
0
));
jgChangeRegistrationReform
.
setAuditStatus
(
"待提交"
);
jgChangeRegistrationReform
.
setStatus
(
UseStatusEnum
.
SUBMIT
.
getPass
());
this
.
save
(
jgChangeRegistrationReform
);
jgRelationEquip
.
setEquipTransferId
(
jgChangeRegistrationReform
.
getSequenceNbr
().
toString
());
jgChangeRegistrationReformMapper
.
insert
(
jgChangeRegistrationReform
);
}
if
(!
ObjectUtils
.
isEmpty
(
map
.
get
(
"submit"
)))
{
String
instanceId
=
""
;
if
(
map
.
containsKey
(
"instanceId"
))
{
instanceId
=
map
.
get
(
"instanceId"
).
toString
();
}
else
{
// 启动并执行流程
instanceId
=
startByVariable
();
jgChangeRegistrationReform
.
setInstanceStatus
(
"1460532889249755137"
);
jgChangeRegistrationReform
.
setUseUnitCreditCode
(
"91610131628001738N"
);
jgChangeRegistrationReform
.
setReceiveCompanyCode
(
"610000"
);
}
if
(!
ObjectUtils
.
isEmpty
(
instanceId
))
{
// 执行流程
String
status
=
flowExecute
(
jgChangeRegistrationReform
.
getSequenceNbr
(),
instanceId
,
"0"
,
""
,
true
);
jgChangeRegistrationReform
.
setAuditStatus
(
"已提交"
);
jgChangeRegistrationReform
.
setStatus
(
UseStatusEnum
.
RECEIVE
.
getPass
());
}
jgChangeRegistrationReform
.
setInstanceId
(
instanceId
);
this
.
getBaseMapper
().
updateById
(
jgChangeRegistrationReform
);
}
}
public
String
startByVariable
()
{
String
instanceId
=
""
;
//启动流程
try
{
ActWorkflowStartDTO
dto
=
new
ActWorkflowStartDTO
();
dto
.
setProcessDefinitionKey
(
"useRegistration"
);
dto
.
setBusinessKey
(
"submit"
);
AjaxResult
ajaxResult
=
Workflow
.
taskClient
.
startByVariable
(
dto
);
instanceId
=
((
Map
)
ajaxResult
.
get
(
"data"
)).
get
(
"id"
).
toString
();
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
return
instanceId
;
}
public
String
flowExecute
(
Long
id
,
String
instanceId
,
String
operate
,
String
comment
,
Boolean
update
)
{
String
role
=
""
;
String
taskName
=
"流程结束"
;
ArrayList
<
String
>
roleList
=
new
ArrayList
<>();
try
{
JSONObject
task
=
workFlowFeginService
.
getTaskNoAuth
(
instanceId
);
JSONObject
taskMessage
=
JSON
.
parseObject
(
JSON
.
toJSONString
(
task
.
get
(
"data"
)));
String
taskId
=
taskMessage
.
getString
(
"id"
);
//组装信息
TaskResultDTO
dto
=
new
TaskResultDTO
();
dto
.
setResultCode
(
"approvalStatus"
);
dto
.
setTaskId
(
taskId
);
dto
.
setComment
(
comment
);
HashMap
<
String
,
Object
>
map
=
new
HashMap
<>();
map
.
put
(
"approvalStatus"
,
operate
);
dto
.
setVariable
(
map
);
//执行流程
Workflow
.
taskClient
.
completeByTask
(
taskId
,
dto
);
// 查询下节点任务
JSONObject
taskNoAuth
=
workFlowFeginService
.
getTaskNoAuth
(
instanceId
);
if
(!
ObjectUtils
.
isEmpty
(
taskNoAuth
.
get
(
"data"
)))
{
JSONObject
nextTask
=
JSON
.
parseObject
(
JSON
.
toJSONString
(
taskNoAuth
.
get
(
"data"
)));
String
nextTaskId
=
nextTask
.
getString
(
"id"
);
taskName
=
nextTask
.
getString
(
"name"
);
AjaxResult
taskGroupName
=
Workflow
.
taskClient
.
getTaskGroupName
(
nextTaskId
);
JSONArray
data
=
JSON
.
parseArray
(
JSON
.
toJSONString
(
taskGroupName
.
get
(
"data"
)));
for
(
Object
datum
:
data
)
{
if
(((
Map
)
datum
).
containsKey
(
"groupId"
))
{
roleList
.
add
(((
Map
)
datum
).
get
(
"groupId"
).
toString
());
}
}
}
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
role
=
String
.
join
(
","
,
roleList
);
if
(
update
)
{
Boolean
rollBack
=
"1"
.
equals
(
operate
)
?
true
:
false
;
updateStatus
(
id
,
instanceId
,
taskName
,
role
,
rollBack
);
}
return
role
;
}
public
void
updateStatus
(
Long
id
,
String
instanceId
,
String
taskName
,
String
role
,
Boolean
rollBack
)
{
ReginParams
reginParams
=
JSONObject
.
parseObject
(
redisUtils
.
get
(
RedisKey
.
buildReginKey
(
RequestContext
.
getExeUserId
(),
RequestContext
.
getToken
())).
toString
(),
ReginParams
.
class
);
LambdaQueryWrapper
<
JgChangeRegistrationReform
>
lambda
=
new
QueryWrapper
<
JgChangeRegistrationReform
>().
lambda
();
lambda
.
eq
(
JgChangeRegistrationReform:
:
getSequenceNbr
,
id
);
JgChangeRegistrationReform
jgChangeRegistrationReform
=
this
.
getBaseMapper
().
selectOne
(
lambda
);
if
(
"流程结束"
.
equals
(
taskName
))
{
jgChangeRegistrationReform
.
setStatus
(
taskName
);
jgChangeRegistrationReform
.
setAuditStatus
(
"已完成"
);
}
else
{
jgChangeRegistrationReform
.
setNextExecuteIds
(
role
);
jgChangeRegistrationReform
.
setPromoter
(
reginParams
.
getUserModel
().
getUserId
());
if
(!
ObjectUtils
.
isEmpty
(
jgChangeRegistrationReform
.
getInstanceStatus
()))
{
jgChangeRegistrationReform
.
setInstanceStatus
(
jgChangeRegistrationReform
.
getInstanceStatus
()
+
","
+
role
);
}
else
{
jgChangeRegistrationReform
.
setInstanceStatus
(
role
);
}
UseStatusEnum
message
=
UseStatusEnum
.
getMessage
(
taskName
);
jgChangeRegistrationReform
.
setStatus
(
message
.
getPass
());
}
if
(
rollBack
)
{
this
.
getBaseMapper
().
update
(
jgChangeRegistrationReform
,
lambda
);
this
.
getBaseMapper
().
updatePromoter
(
jgChangeRegistrationReform
.
getSequenceNbr
());
}
else
{
this
.
getBaseMapper
().
update
(
jgChangeRegistrationReform
,
lambda
);
}
}
public
void
withdraw
(
String
instanceId
)
{
String
taskName
=
""
;
JgChangeRegistrationReform
jgChangeRegistrationReform
=
new
JgChangeRegistrationReform
();
LambdaQueryWrapper
<
JgChangeRegistrationReform
>
lambda
=
new
QueryWrapper
<
JgChangeRegistrationReform
>().
lambda
();
lambda
.
eq
(
JgChangeRegistrationReform:
:
getInstanceId
,
instanceId
);
ArrayList
<
String
>
roleList
=
new
ArrayList
<>();
try
{
workFlowFeginService
.
rollBack
(
instanceId
);
JSONObject
taskNoAuth
=
workFlowFeginService
.
getTaskNoAuth
(
instanceId
);
JSONObject
nextTask
=
JSON
.
parseObject
(
JSON
.
toJSONString
(
taskNoAuth
.
get
(
"data"
)));
taskName
=
nextTask
.
getString
(
"name"
);
if
(!
ObjectUtils
.
isEmpty
(
taskNoAuth
.
get
(
"data"
)))
{
String
nextTaskId
=
nextTask
.
getString
(
"id"
);
AjaxResult
taskGroupName
=
Workflow
.
taskClient
.
getTaskGroupName
(
nextTaskId
);
JSONArray
data
=
JSON
.
parseArray
(
JSON
.
toJSONString
(
taskGroupName
.
get
(
"data"
)));
for
(
Object
datum
:
data
)
{
if
(((
Map
)
datum
).
containsKey
(
"groupId"
))
{
roleList
.
add
(((
Map
)
datum
).
get
(
"groupId"
).
toString
());
}
}
}
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
if
(!
ObjectUtils
.
isEmpty
(
taskName
))
{
UseStatusEnum
message
=
UseStatusEnum
.
getMessage
(
taskName
);
jgChangeRegistrationReform
.
setStatus
(
message
.
getPass
());
}
String
join
=
String
.
join
(
","
,
roleList
);
JgChangeRegistrationReform
jgChangeRegistrationReform1
=
this
.
getBaseMapper
().
selectOne
(
lambda
);
this
.
updateStatus
(
jgChangeRegistrationReform1
.
getSequenceNbr
(),
instanceId
,
taskName
,
join
,
true
);
}
public
void
deleteBatch
(
List
<
Long
>
ids
)
{
JgChangeRegistrationReform
jgChangeRegistrationReform
=
new
JgChangeRegistrationReform
();
jgChangeRegistrationReform
.
setIsDelete
(
true
);
LambdaQueryWrapper
<
JgChangeRegistrationReform
>
lambda
=
new
QueryWrapper
<
JgChangeRegistrationReform
>().
lambda
();
lambda
.
in
(
JgChangeRegistrationReform:
:
getSequenceNbr
,
ids
);
this
.
update
(
jgChangeRegistrationReform
,
lambda
);
}
public
Map
<
String
,
Object
>
getDetail
(
String
id
)
{
Map
<
String
,
Object
>
detail
=
this
.
baseMapper
.
getDetail
(
id
);
Map
<
String
,
Object
>
inspectDetail
=
this
.
baseMapper
.
getInspectDetail
(
id
);
Map
<
String
,
Object
>
useDetail
=
this
.
baseMapper
.
getUseDetail
(
id
);
detail
.
putAll
(
inspectDetail
);
detail
.
putAll
(
useDetail
);
detail
.
putAll
(
useDetail
);
detail
.
put
(
"proDuctPhoto"
,
JSON
.
parse
(
String
.
valueOf
(
detail
.
get
(
"proDuctPhoto"
))));
detail
.
put
(
"factoryStandard"
,
JSON
.
parse
(
String
.
valueOf
(
detail
.
get
(
"factoryStandard"
))));
detail
.
put
(
"productQualityYieldProve"
,
JSON
.
parse
(
String
.
valueOf
(
detail
.
get
(
"productQualityYieldProve"
))));
detail
.
put
(
"insUseMaintainExplanin"
,
JSON
.
parse
(
String
.
valueOf
(
detail
.
get
(
"insUseMaintainExplanin"
))));
detail
.
put
(
"inspectReport"
,
JSON
.
parse
(
String
.
valueOf
(
detail
.
get
(
"inspectReport"
))));
return
detail
;
}
}
}
}
\ 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