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
6ff62da9
Commit
6ff62da9
authored
Dec 15, 2023
by
yangyang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register
parents
95fa46fa
ae8ab99c
Hide whitespace changes
Inline
Side-by-side
Showing
24 changed files
with
118 additions
and
46 deletions
+118
-46
pom.xml
...m-tzs/amos-boot-module-jg/amos-boot-module-jg-api/pom.xml
+1
-5
JgInstallationNoticeServiceImpl.java
.../jg/biz/service/impl/JgInstallationNoticeServiceImpl.java
+4
-5
pom.xml
...s/amos-boot-module-jyjc/amos-boot-module-jyjc-api/pom.xml
+3
-1
JyjcBaseMapper.java
...join/amos/boot/module/jyjc/api/mapper/JyjcBaseMapper.java
+1
-6
JyjcOpeningApplicationModel.java
...ot/module/jyjc/api/model/JyjcOpeningApplicationModel.java
+2
-2
IJyjcInspectionResultAttachmentService.java
...c/api/service/IJyjcInspectionResultAttachmentService.java
+17
-1
IJyjcInspectionResultService.java
...module/jyjc/api/service/IJyjcInspectionResultService.java
+13
-1
JyjcBaseMapper.xml
...ule-jyjc-api/src/main/resources/mapper/JyjcBaseMapper.xml
+1
-1
pom.xml
...s/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/pom.xml
+1
-0
BaseException.java
...ejoin/amos/boot/module/jyjc/biz/config/BaseException.java
+1
-1
CommonException.java
...oin/amos/boot/module/jyjc/biz/config/CommonException.java
+2
-2
JyjcInspectionResultController.java
...e/jyjc/biz/controller/JyjcInspectionResultController.java
+4
-2
JyjcInspectionResultAttachmentServiceImpl.java
...rvice/impl/JyjcInspectionResultAttachmentServiceImpl.java
+9
-0
JyjcInspectionResultServiceImpl.java
...yjc/biz/service/impl/JyjcInspectionResultServiceImpl.java
+37
-0
JyjcOpeningApplicationServiceImpl.java
...c/biz/service/impl/JyjcOpeningApplicationServiceImpl.java
+8
-9
BaseUnitLicenceDto.java
...join/amos/boot/module/tcm/api/dto/BaseUnitLicenceDto.java
+1
-1
TzBaseUnitLicenceDto.java
...in/amos/boot/module/tcm/api/dto/TzBaseUnitLicenceDto.java
+1
-1
BaseUnitLicence.java
...join/amos/boot/module/tcm/api/entity/BaseUnitLicence.java
+2
-1
TzBaseUnitLicence.java
...in/amos/boot/module/tcm/api/entity/TzBaseUnitLicence.java
+1
-1
application.properties
...-module-tcm-biz/src/main/resources/application.properties
+1
-1
TzsUserInfoDto.java
.../yeejoin/amos/boot/module/ymt/api/dto/TzsUserInfoDto.java
+3
-0
ApplicationFormTypeEnum.java
...os/boot/module/ymt/api/enums/ApplicationFormTypeEnum.java
+1
-1
ICreateCodeService.java
.../amos/boot/module/ymt/api/service/ICreateCodeService.java
+1
-1
CreateCodeServiceImpl.java
...ot/module/ymt/api/service/impl/CreateCodeServiceImpl.java
+3
-3
No files found.
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/pom.xml
View file @
6ff62da9
...
@@ -20,11 +20,7 @@
...
@@ -20,11 +20,7 @@
<groupId>
com.amosframework.boot
</groupId>
<groupId>
com.amosframework.boot
</groupId>
<artifactId>
amos-boot-module-ymt-api
</artifactId>
<artifactId>
amos-boot-module-ymt-api
</artifactId>
<version>
1.0.0
</version>
<version>
1.0.0
</version>
</dependency>
<scope>
compile
</scope>
<dependency>
<groupId>
com.amosframework.boot
</groupId>
<artifactId>
amos-boot-module-tcm-api
</artifactId>
<version>
1.0.0
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.amosframework.boot
</groupId>
<groupId>
com.amosframework.boot
</groupId>
...
...
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/JgInstallationNoticeServiceImpl.java
View file @
6ff62da9
...
@@ -11,21 +11,20 @@ import com.yeejoin.amos.boot.module.jg.api.enums.FlowStatusEnum;
...
@@ -11,21 +11,20 @@ import com.yeejoin.amos.boot.module.jg.api.enums.FlowStatusEnum;
import
com.yeejoin.amos.boot.module.jg.api.mapper.JgInstallationNoticeMapper
;
import
com.yeejoin.amos.boot.module.jg.api.mapper.JgInstallationNoticeMapper
;
import
com.yeejoin.amos.boot.module.jg.api.mapper.JgRelationEquipMapper
;
import
com.yeejoin.amos.boot.module.jg.api.mapper.JgRelationEquipMapper
;
import
com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService
;
import
com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService
;
import
com.yeejoin.amos.boot.module.
tcm
.api.enums.ApplicationFormTypeEnum
;
import
com.yeejoin.amos.boot.module.
ymt
.api.enums.ApplicationFormTypeEnum
;
import
com.yeejoin.amos.boot.module.
tcm
.api.service.ICreateCodeService
;
import
com.yeejoin.amos.boot.module.
ymt
.api.service.ICreateCodeService
;
import
com.yeejoin.amos.feign.workflow.Workflow
;
import
com.yeejoin.amos.feign.workflow.Workflow
;
import
com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO
;
import
com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO
;
import
com.yeejoin.amos.feign.workflow.model.AjaxResult
;
import
com.yeejoin.amos.feign.workflow.model.AjaxResult
;
import
com.yeejoin.amos.feign.workflow.model.TaskResultDTO
;
import
com.yeejoin.amos.feign.workflow.model.TaskResultDTO
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.stereotype.Service
;
import
org.springframework.util.CollectionUtils
;
import
org.springframework.util.CollectionUtils
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.util.StringUtils
;
import
org.springframework.util.StringUtils
;
import
org.typroject.tyboot.core.rdbms.service.BaseService
;
import
org.typroject.tyboot.core.rdbms.service.BaseService
;
import
java.util.*
;
import
java.util.*
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
...
@@ -45,8 +44,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
...
@@ -45,8 +44,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
private
JgRelationEquipMapper
jgRelationEquipMapper
;
private
JgRelationEquipMapper
jgRelationEquipMapper
;
@Autowired
@Autowired
private
JgInstallationNoticeMapper
jgInstallationNoticeMapper
;
private
JgInstallationNoticeMapper
jgInstallationNoticeMapper
;
@Autowired
@Autowired
@SuppressWarnings
(
"all"
)
private
ICreateCodeService
iCreateCodeService
;
private
ICreateCodeService
iCreateCodeService
;
/**
/**
...
...
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/pom.xml
View file @
6ff62da9
...
@@ -18,8 +18,9 @@
...
@@ -18,8 +18,9 @@
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.amosframework.boot
</groupId>
<groupId>
com.amosframework.boot
</groupId>
<artifactId>
amos-boot-module-
tcm
-api
</artifactId>
<artifactId>
amos-boot-module-
ymt
-api
</artifactId>
<version>
1.0.0
</version>
<version>
1.0.0
</version>
<scope>
compile
</scope>
</dependency>
</dependency>
</dependencies>
</dependencies>
</project>
</project>
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcBaseMapper.java
View file @
6ff62da9
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jyjc
.
api
.
mapper
;
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jyjc
.
api
.
mapper
;
import
com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseEnterpriseInfoDto
;
import
com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseUnitLicenceDto
;
import
com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseUnitLicenceDto
;
import
com.yeejoin.amos.boot.module.tcm.api.dto.TzsUserInfoDto
;
import
org.apache.ibatis.annotations.MapKey
;
import
org.apache.ibatis.annotations.MapKey
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Select
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
...
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcOpeningApplicationModel.java
View file @
6ff62da9
...
@@ -3,8 +3,8 @@ package com.yeejoin.amos.boot.module.jyjc.api.model;
...
@@ -3,8 +3,8 @@ package com.yeejoin.amos.boot.module.jyjc.api.model;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler
;
import
com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler
;
import
com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto
;
import
com.yeejoin.amos.boot.module.
tcm
.api.dto.TzBaseUnitLicenceDto
;
import
com.yeejoin.amos.boot.module.
ymt
.api.dto.TzBaseUnitLicenceDto
;
import
com.yeejoin.amos.boot.module.
tcm
.api.dto.TzsUserInfoDto
;
import
com.yeejoin.amos.boot.module.
ymt
.api.dto.TzsUserInfoDto
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
...
...
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/service/IJyjcInspectionResultAttachmentService.java
View file @
6ff62da9
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jyjc
.
api
.
service
;
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jyjc
.
api
.
service
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResultAttachment
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.typroject.tyboot.core.rdbms.service.BaseService
;
import
java.util.List
;
/**
/**
* 接口类
* 接口类
*
*
* @author system_generator
* @author system_generator
* @date 2023-12-14
* @date 2023-12-14
*/
*/
public
interface
IJyjcInspectionResultAttachmentService
{}
public
interface
IJyjcInspectionResultAttachmentService
{
/**
* 根据结果表主键获取附件列表
*
* @param resultSeq
* @return
*/
List
<
JyjcInspectionResultAttachment
>
getObjByResultSeq
(
Long
resultSeq
);
}
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/service/IJyjcInspectionResultService.java
View file @
6ff62da9
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jyjc
.
api
.
service
;
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jyjc
.
api
.
service
;
import
com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionResultModel
;
import
java.util.Map
;
/**
/**
* 业务开通申请表接口类
* 业务开通申请表接口类
*
*
* @author system_generator
* @author system_generator
* @date 2023-12-14
* @date 2023-12-14
*/
*/
public
interface
IJyjcInspectionResultService
{}
public
interface
IJyjcInspectionResultService
{
/**
* 获取检验结果详情
* @param sequenceNbr 结果主键
* @return 检验结果实体
*/
Map
<
String
,
Object
>
queryDetailBySeq
(
Long
sequenceNbr
);
}
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcBaseMapper.xml
View file @
6ff62da9
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
<!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.jyjc.api.mapper.JyjcBaseMapper"
>
<mapper
namespace=
"com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcBaseMapper"
>
<select
id=
"selectBaseUnitLicenceList"
parameterType=
"map"
resultType=
"com.yeejoin.amos.boot.module.
tcm
.api.dto.TzBaseUnitLicenceDto"
>
<select
id=
"selectBaseUnitLicenceList"
parameterType=
"map"
resultType=
"com.yeejoin.amos.boot.module.
ymt
.api.dto.TzBaseUnitLicenceDto"
>
select * from tz_base_unit_licence
select * from tz_base_unit_licence
where unit_code = #{unitCode}
where unit_code = #{unitCode}
<if
test=
"licenceType !=null and licenceType != ''"
>
<if
test=
"licenceType !=null and licenceType != ''"
>
...
...
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/pom.xml
View file @
6ff62da9
...
@@ -15,6 +15,7 @@
...
@@ -15,6 +15,7 @@
<groupId>
com.amosframework.boot
</groupId>
<groupId>
com.amosframework.boot
</groupId>
<artifactId>
amos-boot-module-jyjc-api
</artifactId>
<artifactId>
amos-boot-module-jyjc-api
</artifactId>
<version>
1.0.0
</version>
<version>
1.0.0
</version>
<scope>
compile
</scope>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.amosframework.boot
</groupId>
<groupId>
com.amosframework.boot
</groupId>
...
...
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/config/BaseException.java
View file @
6ff62da9
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jyjc
.
biz
.
config
;
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jyjc
.
biz
.
config
;
import
com.yeejoin.amos.boot.module.
tcm
.api.enums.BaseExceptionEnum
;
import
com.yeejoin.amos.boot.module.
ymt
.api.enums.BaseExceptionEnum
;
/**
/**
* @Author cpp
* @Author cpp
...
...
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/config/CommonException.java
View file @
6ff62da9
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jyjc
.
biz
.
config
;
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jyjc
.
biz
.
config
;
import
com.yeejoin.amos.boot.module.
tcm
.api.common.BaseException
;
import
com.yeejoin.amos.boot.module.
ymt
.api.common.BaseException
;
import
com.yeejoin.amos.boot.module.
tcm
.api.enums.CommonErrorEnum
;
import
com.yeejoin.amos.boot.module.
ymt
.api.enums.CommonErrorEnum
;
/**
/**
* @description: 共同异常类
* @description: 共同异常类
...
...
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcInspectionResultController.java
View file @
6ff62da9
...
@@ -6,6 +6,8 @@ import io.swagger.annotations.Api;
...
@@ -6,6 +6,8 @@ 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.List
;
import
java.util.List
;
import
java.util.Map
;
import
com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcInspectionResultServiceImpl
;
import
com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcInspectionResultServiceImpl
;
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
;
...
@@ -80,8 +82,8 @@ public class JyjcInspectionResultController extends BaseController {
...
@@ -80,8 +82,8 @@ public class JyjcInspectionResultController extends BaseController {
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@GetMapping
(
value
=
"/{sequenceNbr}"
)
@GetMapping
(
value
=
"/{sequenceNbr}"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"根据sequenceNbr查询单个"
,
notes
=
"根据sequenceNbr查询单个"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"根据sequenceNbr查询单个"
,
notes
=
"根据sequenceNbr查询单个"
)
public
ResponseModel
<
JyjcInspectionResultModel
>
selectOne
(
@PathVariable
Long
sequenceNbr
)
{
public
ResponseModel
<
Map
<
String
,
Object
>
>
selectOne
(
@PathVariable
Long
sequenceNbr
)
{
return
ResponseHelper
.
buildResponse
(
jyjcInspectionResultServiceImpl
.
queryBySeq
(
sequenceNbr
));
return
ResponseHelper
.
buildResponse
(
jyjcInspectionResultServiceImpl
.
query
Detail
BySeq
(
sequenceNbr
));
}
}
/**
/**
...
...
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionResultAttachmentServiceImpl.java
View file @
6ff62da9
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jyjc
.
biz
.
service
.
impl
;
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jyjc
.
biz
.
service
.
impl
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResultAttachment
;
import
com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResultAttachment
;
import
com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionResultAttachmentMapper
;
import
com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionResultAttachmentMapper
;
import
com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionResultAttachmentService
;
import
com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionResultAttachmentService
;
...
@@ -30,4 +31,11 @@ public class JyjcInspectionResultAttachmentServiceImpl extends BaseService<JyjcI
...
@@ -30,4 +31,11 @@ public class JyjcInspectionResultAttachmentServiceImpl extends BaseService<JyjcI
public
List
<
JyjcInspectionResultAttachmentModel
>
queryForJyjcInspectionResultAttachmentList
()
{
public
List
<
JyjcInspectionResultAttachmentModel
>
queryForJyjcInspectionResultAttachmentList
()
{
return
this
.
queryForList
(
""
,
false
);
return
this
.
queryForList
(
""
,
false
);
}
}
@Override
public
List
<
JyjcInspectionResultAttachment
>
getObjByResultSeq
(
Long
resultSeq
)
{
LambdaQueryWrapper
<
JyjcInspectionResultAttachment
>
wrapper
=
new
LambdaQueryWrapper
<>();
wrapper
.
eq
(
JyjcInspectionResultAttachment:
:
getResultSeq
,
resultSeq
);
return
this
.
baseMapper
.
selectList
(
wrapper
);
}
}
}
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionResultServiceImpl.java
View file @
6ff62da9
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jyjc
.
biz
.
service
.
impl
;
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jyjc
.
biz
.
service
.
impl
;
import
cn.hutool.core.bean.BeanUtil
;
import
cn.hutool.core.map.MapUtil
;
import
com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResult
;
import
com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResult
;
import
com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResultAttachment
;
import
com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionResultMapper
;
import
com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionResultMapper
;
import
com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionResultAttachmentService
;
import
com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionResultService
;
import
com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionResultService
;
import
com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionResultModel
;
import
com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionResultModel
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.util.CollectionUtils
;
import
org.springframework.util.ObjectUtils
;
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.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
/**
/**
* 业务开通申请表服务实现类
* 业务开通申请表服务实现类
...
@@ -17,6 +29,11 @@ import java.util.List;
...
@@ -17,6 +29,11 @@ import java.util.List;
*/
*/
@Service
@Service
public
class
JyjcInspectionResultServiceImpl
extends
BaseService
<
JyjcInspectionResultModel
,
JyjcInspectionResult
,
JyjcInspectionResultMapper
>
implements
IJyjcInspectionResultService
{
public
class
JyjcInspectionResultServiceImpl
extends
BaseService
<
JyjcInspectionResultModel
,
JyjcInspectionResult
,
JyjcInspectionResultMapper
>
implements
IJyjcInspectionResultService
{
@Autowired
private
IJyjcInspectionResultAttachmentService
jyjcInspectionResultAttachmentService
;
/**
/**
* 分页查询
* 分页查询
*/
*/
...
@@ -30,4 +47,23 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
...
@@ -30,4 +47,23 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
public
List
<
JyjcInspectionResultModel
>
queryForJyjcInspectionResultList
()
{
public
List
<
JyjcInspectionResultModel
>
queryForJyjcInspectionResultList
()
{
return
this
.
queryForList
(
""
,
false
);
return
this
.
queryForList
(
""
,
false
);
}
}
@Override
public
Map
<
String
,
Object
>
queryDetailBySeq
(
Long
sequenceNbr
)
{
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
JyjcInspectionResultModel
jyjcInspectionResultModel
=
this
.
queryBySeq
(
sequenceNbr
);
if
(!
ObjectUtils
.
isEmpty
(
jyjcInspectionResultModel
))
{
// 对象转map
map
=
BeanUtil
.
beanToMap
(
jyjcInspectionResultModel
);
// 获取附件
List
<
JyjcInspectionResultAttachment
>
attachmentList
=
jyjcInspectionResultAttachmentService
.
getObjByResultSeq
(
sequenceNbr
);
if
(!
CollectionUtils
.
isEmpty
(
attachmentList
))
{
Map
<
String
,
Object
>
attachmentMap
=
attachmentList
.
stream
().
collect
(
Collectors
.
toMap
(
JyjcInspectionResultAttachment:
:
getAttachmentType
,
JyjcInspectionResultAttachment:
:
getAttachmentUrl
));
map
.
putAll
(
attachmentMap
);
}
}
return
map
;
}
}
}
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcOpeningApplicationServiceImpl.java
View file @
6ff62da9
...
@@ -18,13 +18,13 @@ import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcOpeningApplicationServ
...
@@ -18,13 +18,13 @@ import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcOpeningApplicationServ
import
com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationModel
;
import
com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationModel
;
import
com.yeejoin.amos.boot.module.jyjc.biz.config.BaseException
;
import
com.yeejoin.amos.boot.module.jyjc.biz.config.BaseException
;
import
com.yeejoin.amos.boot.module.jyjc.biz.feign.WorkflowFeignClient
;
import
com.yeejoin.amos.boot.module.jyjc.biz.feign.WorkflowFeignClient
;
import
com.yeejoin.amos.boot.module.
tcm
.api.dto.TzBaseUnitLicenceDto
;
import
com.yeejoin.amos.boot.module.
ymt
.api.dto.TzBaseUnitLicenceDto
;
import
com.yeejoin.amos.boot.module.
tcm
.api.dto.TzsUserInfoDto
;
import
com.yeejoin.amos.boot.module.
ymt
.api.dto.TzsUserInfoDto
;
import
com.yeejoin.amos.boot.module.
tcm
.api.entity.TzBaseEnterpriseInfo
;
import
com.yeejoin.amos.boot.module.
ymt
.api.entity.TzBaseEnterpriseInfo
;
import
com.yeejoin.amos.boot.module.
tcm
.api.entity.TzsUserInfo
;
import
com.yeejoin.amos.boot.module.
ymt
.api.entity.TzsUserInfo
;
import
com.yeejoin.amos.boot.module.
tcm
.api.mapper.TzBaseEnterpriseInfoMapper
;
import
com.yeejoin.amos.boot.module.
ymt
.api.mapper.TzBaseEnterpriseInfoMapper
;
import
com.yeejoin.amos.boot.module.
tcm
.api.mapper.TzBaseUnitLicenceMapper
;
import
com.yeejoin.amos.boot.module.
ymt
.api.mapper.TzBaseUnitLicenceMapper
;
import
com.yeejoin.amos.boot.module.
tcm
.api.mapper.TzsUserInfoMapper
;
import
com.yeejoin.amos.boot.module.
ymt
.api.mapper.TzsUserInfoMapper
;
import
com.yeejoin.amos.component.feign.model.FeignClientResult
;
import
com.yeejoin.amos.component.feign.model.FeignClientResult
;
import
com.yeejoin.amos.feign.workflow.Workflow
;
import
com.yeejoin.amos.feign.workflow.Workflow
;
import
com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO
;
import
com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO
;
...
@@ -42,7 +42,6 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
...
@@ -42,7 +42,6 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
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
javax.annotation.Resource
;
import
javax.annotation.Resource
;
import
java.text.SimpleDateFormat
;
import
java.text.SimpleDateFormat
;
import
java.util.*
;
import
java.util.*
;
...
@@ -307,7 +306,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
...
@@ -307,7 +306,7 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
if
(
op
.
equals
(
"0"
)){
if
(
op
.
equals
(
"0"
)){
String
originalDataId
=
params
.
get
(
"originalDataId"
).
toString
();
String
originalDataId
=
params
.
get
(
"originalDataId"
).
toString
();
JyjcOpeningApplication
jyjcOpeningApplication
=
jyjcOpeningApplicationMapper
.
selectById
(
originalDataId
);
JyjcOpeningApplication
jyjcOpeningApplication
=
jyjcOpeningApplicationMapper
.
selectById
(
originalDataId
);
List
<
String
>
detectionRegion
=
Arrays
.
asList
(
params
.
get
(
"detectionRegion"
).
toString
().
split
(
","
))
;
List
<
String
>
detectionRegion
=
Arrays
.
asList
(
params
.
get
(
"detectionRegion"
).
toString
().
replace
(
"["
,
""
).
replace
(
"]"
,
""
).
split
(
","
))
;
// String detectionRegionName = params.get("detectionRegionName").toString();
// String detectionRegionName = params.get("detectionRegionName").toString();
jyjcOpeningApplication
.
setDetectionRegion
(
detectionRegion
);
jyjcOpeningApplication
.
setDetectionRegion
(
detectionRegion
);
// jyjcOpeningApplication.setDetectionRegionName(detectionRegionName);
// jyjcOpeningApplication.setDetectionRegionName(detectionRegionName);
...
...
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/BaseUnitLicenceDto.java
View file @
6ff62da9
...
@@ -102,7 +102,7 @@ public class BaseUnitLicenceDto extends BaseDto {
...
@@ -102,7 +102,7 @@ public class BaseUnitLicenceDto extends BaseDto {
private
String
agencyType
;
private
String
agencyType
;
@ApiModelProperty
(
value
=
"机构类别枚举名称,冗余"
)
@ApiModelProperty
(
value
=
"机构类别枚举名称,冗余"
)
private
String
agencyType
Cod
e
;
private
String
agencyType
Nam
e
;
@ApiModelProperty
(
value
=
"资质类型编码(检验检测、其他)"
)
@ApiModelProperty
(
value
=
"资质类型编码(检验检测、其他)"
)
private
String
licenceType
;
private
String
licenceType
;
...
...
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/TzBaseUnitLicenceDto.java
View file @
6ff62da9
...
@@ -97,7 +97,7 @@ public class TzBaseUnitLicenceDto extends BaseDto {
...
@@ -97,7 +97,7 @@ public class TzBaseUnitLicenceDto extends BaseDto {
private
String
agencyType
;
private
String
agencyType
;
@ApiModelProperty
(
value
=
"机构类别枚举名称,冗余"
)
@ApiModelProperty
(
value
=
"机构类别枚举名称,冗余"
)
private
String
agencyType
Cod
e
;
private
String
agencyType
Nam
e
;
@ApiModelProperty
(
value
=
"资质类型编码(检验检测、其他)"
)
@ApiModelProperty
(
value
=
"资质类型编码(检验检测、其他)"
)
private
String
licenceType
;
private
String
licenceType
;
...
...
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/entity/BaseUnitLicence.java
View file @
6ff62da9
...
@@ -25,6 +25,7 @@ public class BaseUnitLicence extends BaseEntity {
...
@@ -25,6 +25,7 @@ public class BaseUnitLicence extends BaseEntity {
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
/**
/**
* 单位编码
* 单位编码
*/
*/
...
@@ -176,7 +177,7 @@ public class BaseUnitLicence extends BaseEntity {
...
@@ -176,7 +177,7 @@ public class BaseUnitLicence extends BaseEntity {
private
String
agencyType
;
private
String
agencyType
;
@ApiModelProperty
(
value
=
"机构类别枚举名称,冗余"
)
@ApiModelProperty
(
value
=
"机构类别枚举名称,冗余"
)
private
String
agencyType
Cod
e
;
private
String
agencyType
Nam
e
;
@ApiModelProperty
(
value
=
"资质类型编码(检验检测、其他)"
)
@ApiModelProperty
(
value
=
"资质类型编码(检验检测、其他)"
)
private
String
licenceType
;
private
String
licenceType
;
...
...
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/entity/TzBaseUnitLicence.java
View file @
6ff62da9
...
@@ -102,7 +102,7 @@ public class TzBaseUnitLicence extends BaseEntity {
...
@@ -102,7 +102,7 @@ public class TzBaseUnitLicence extends BaseEntity {
private
String
agencyType
;
private
String
agencyType
;
@ApiModelProperty
(
value
=
"机构类别枚举名称,冗余"
)
@ApiModelProperty
(
value
=
"机构类别枚举名称,冗余"
)
private
String
agencyType
Cod
e
;
private
String
agencyType
Nam
e
;
@ApiModelProperty
(
value
=
"资质类型编码(检验检测、其他)"
)
@ApiModelProperty
(
value
=
"资质类型编码(检验检测、其他)"
)
private
String
licenceType
;
private
String
licenceType
;
...
...
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/resources/application.properties
View file @
6ff62da9
spring.application.name
=
TZS-COMMON
-tb
spring.application.name
=
TZS-COMMON
server.servlet.context-path
=
/tcm
server.servlet.context-path
=
/tcm
server.port
=
11002
server.port
=
11002
spring.profiles.active
=
dev
spring.profiles.active
=
dev
...
...
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/dto/TzsUserInfoDto.java
View file @
6ff62da9
...
@@ -32,6 +32,9 @@ public class TzsUserInfoDto extends BaseDto {
...
@@ -32,6 +32,9 @@ public class TzsUserInfoDto extends BaseDto {
@ApiModelProperty
(
value
=
"岗位"
)
@ApiModelProperty
(
value
=
"岗位"
)
private
String
post
;
private
String
post
;
@ApiModelProperty
(
value
=
"岗位名称"
)
private
String
postName
;
@ApiModelProperty
(
value
=
"联系电话"
)
@ApiModelProperty
(
value
=
"联系电话"
)
private
String
phone
;
private
String
phone
;
...
...
amos-boot-system-tzs/amos-boot-module-
tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm
/api/enums/ApplicationFormTypeEnum.java
→
amos-boot-system-tzs/amos-boot-module-
ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt
/api/enums/ApplicationFormTypeEnum.java
View file @
6ff62da9
package
com
.
yeejoin
.
amos
.
boot
.
module
.
tcm
.
api
.
enums
;
package
com
.
yeejoin
.
amos
.
boot
.
module
.
ymt
.
api
.
enums
;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
import
lombok.Getter
;
import
lombok.Getter
;
...
...
amos-boot-system-tzs/amos-boot-module-
tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm
/api/service/ICreateCodeService.java
→
amos-boot-system-tzs/amos-boot-module-
ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt
/api/service/ICreateCodeService.java
View file @
6ff62da9
package
com
.
yeejoin
.
amos
.
boot
.
module
.
tcm
.
api
.
service
;
package
com
.
yeejoin
.
amos
.
boot
.
module
.
ymt
.
api
.
service
;
import
java.util.List
;
import
java.util.List
;
...
...
amos-boot-system-tzs/amos-boot-module-
tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz
/service/impl/CreateCodeServiceImpl.java
→
amos-boot-system-tzs/amos-boot-module-
ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api
/service/impl/CreateCodeServiceImpl.java
View file @
6ff62da9
package
com
.
yeejoin
.
amos
.
boot
.
module
.
tcm
.
biz
.
service
.
impl
;
package
com
.
yeejoin
.
amos
.
boot
.
module
.
ymt
.
api
.
service
.
impl
;
import
com.yeejoin.amos.boot.module.
tcm
.api.enums.ApplicationFormTypeEnum
;
import
com.yeejoin.amos.boot.module.
ymt
.api.enums.ApplicationFormTypeEnum
;
import
com.yeejoin.amos.boot.module.
tcm
.api.service.ICreateCodeService
;
import
com.yeejoin.amos.boot.module.
ymt
.api.service.ICreateCodeService
;
import
org.springframework.data.redis.core.RedisTemplate
;
import
org.springframework.data.redis.core.RedisTemplate
;
import
org.springframework.data.redis.core.ValueOperations
;
import
org.springframework.data.redis.core.ValueOperations
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
...
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