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
23a4a517
Commit
23a4a517
authored
Dec 09, 2022
by
曹盼盼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加任务列表跳转页面的需要的数据
parent
5879ce1f
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
306 additions
and
6 deletions
+306
-6
UrlEnum.java
...va/com/yeejoin/amos/boot/module/ugp/api/Enum/UrlEnum.java
+45
-0
TaskDto.java
...ava/com/yeejoin/amos/boot/module/ugp/api/dto/TaskDto.java
+3
-0
TzUgpPathDto.java
...om/yeejoin/amos/boot/module/ugp/api/dto/TzUgpPathDto.java
+39
-0
TzUgpPath.java
...om/yeejoin/amos/boot/module/ugp/api/entity/TzUgpPath.java
+40
-0
TzUgpPathDao.java
...yeejoin/amos/boot/module/ugp/api/mapper/TzUgpPathDao.java
+19
-0
TzUgpPathService.java
...in/amos/boot/module/ugp/api/service/TzUgpPathService.java
+14
-0
TzUgpPathDao.xml
...module-ugp-api/src/main/resources/mapper/TzUgpPathDao.xml
+110
-0
TzUgpPathController.java
...s/boot/module/ugp/biz/controller/TzUgpPathController.java
+14
-0
CompanyServiceImpl.java
.../boot/module/ugp/biz/service/impl/CompanyServiceImpl.java
+0
-5
ProjectInitiationServiceImpl.java
...le/ugp/biz/service/impl/ProjectInitiationServiceImpl.java
+0
-1
TaskServiceImpl.java
...mos/boot/module/ugp/biz/service/impl/TaskServiceImpl.java
+0
-0
TzUgpPathServiceImpl.java
...oot/module/ugp/biz/service/impl/TzUgpPathServiceImpl.java
+22
-0
No files found.
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/UrlEnum.java
0 → 100644
View file @
23a4a517
package
com
.
yeejoin
.
amos
.
boot
.
module
.
ugp
.
api
.
Enum
;
import
lombok.AllArgsConstructor
;
import
lombok.Getter
;
/**
* @Author cpp
* @Description
* @Date 2022/12/9
*/
@Getter
@AllArgsConstructor
public
enum
UrlEnum
{
待办安装单位上传监检资料
(
0
,
"待办安装单位上传监检资料"
),
已办安装单位上传监检资料
(
1
,
"已办安装单位上传监检资料"
),
待办安装单位编制质量问题处理
(
2
,
"待办安装单位编制质量问题处理"
),
已办安装单位编制质量问题处理
(
3
,
"已办安装单位编制质量问题处理"
),
待办安装单位提交整改书
(
4
,
"待办安装单位提交整改书"
),
已办安装单位提交整改书
(
5
,
"已办安装单位提交整改书"
),
待办安装单位告知申请
(
6
,
"待办安装单位告知申请"
),
已办安装单位告知申请
(
7
,
"已办安装单位告知申请"
),
待办设计单位上传监检资料
(
8
,
"待办设计单位上传监检资料"
),
已办设计单位上传监检资料
(
9
,
"已办设计单位上传监检资料"
),
待办建设单位审查质量问题处理方案
(
10
,
"待办建设单位审查质量问题处理方案"
),
已办建设单位审查质量问题处理方案
(
11
,
"已办建设单位审查质量问题处理方案"
),
待办监察单位确认接收的告知申请
(
12
,
"待办监察单位确认接收的告知申请"
),
已办监察单位确认接收的告知申请
(
13
,
"已办监察单位确认接收的告知申请"
),
待办验检测单位审核告知申请
(
14
,
"待办验检测单位审核告知申请"
),
已办验检测单位审核告知申请
(
15
,
"已办验检测单位审核告知申请"
),
待办检验检测单位审批项目监检资料
(
16
,
"待办检验检测单位审批项目监检资料"
),
已办检验检测单位审批项目监检资料
(
17
,
"已办检验检测单位审批项目监检资料"
),
待办检验检测单位审查质量问题
(
18
,
"待办检验检测单位审查问题"
),
已办检验检测单位审查质量问题
(
19
,
"已办检验检测单位审查问题"
),
待办检验检测单位审查整改过程
(
20
,
"待办检验检测单位审查整改过程"
),
已办检验检测单位审查整改过程
(
21
,
"已办检验检测单位审查整改过程"
),
待办检验检测单位问题分类
(
22
,
"待办检验检测单位问题分类"
),
已办检验检测单位问题分类
(
23
,
"待办检验检测单位问题分类"
),
待办企业审核任务
(
24
,
"待办企业审核任务"
),
已办企业审核任务
(
25
,
"已办企业审核任务"
);
private
Integer
status
;
private
String
name
;
}
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/TaskDto.java
View file @
23a4a517
...
@@ -36,4 +36,7 @@ public class TaskDto extends BaseDto {
...
@@ -36,4 +36,7 @@ public class TaskDto extends BaseDto {
private
Integer
companyId
;
private
Integer
companyId
;
Object
extend
;
//url
Integer
number
;
//状态码
}
}
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/TzUgpPathDto.java
0 → 100644
View file @
23a4a517
package
com
.
yeejoin
.
amos
.
boot
.
module
.
ugp
.
api
.
dto
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.yeejoin.amos.boot.biz.common.dto.BaseDto
;
import
com.yeejoin.amos.boot.biz.common.entity.BaseEntity
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.experimental.Accessors
;
import
java.util.Date
;
/**
* 页面路径表(TzUgpPath)实体类
*
* @author makejava
* @since 2022-12-09 18:52:39
*/
@Data
public
class
TzUgpPathDto
extends
BaseDto
{
private
static
final
long
serialVersionUID
=
1L
;
private
String
name
;
private
String
url
;
private
Integer
status
;
private
Long
recUserId
;
private
Date
recDate
;
private
Integer
isDelete
;
private
String
recUserName
;
}
\ No newline at end of file
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/entity/TzUgpPath.java
0 → 100644
View file @
23a4a517
package
com
.
yeejoin
.
amos
.
boot
.
module
.
ugp
.
api
.
entity
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.yeejoin.amos.boot.biz.common.entity.BaseEntity
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.experimental.Accessors
;
import
java.util.Date
;
/**
* 页面路径表(TzUgpPath)实体类
*
* @author makejava
* @since 2022-12-09 18:52:39
*/
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"tz_ugp_path"
)
public
class
TzUgpPath
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
private
String
name
;
/**
* url路径
*/
private
String
url
;
private
Integer
status
;
private
Long
recUserId
;
private
Date
recDate
;
private
Integer
isDelete
;
private
String
recUserName
;
}
\ No newline at end of file
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/mapper/TzUgpPathDao.java
0 → 100644
View file @
23a4a517
package
com
.
yeejoin
.
amos
.
boot
.
module
.
ugp
.
api
.
mapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.yeejoin.amos.boot.module.ugp.api.entity.TzUgpPath
;
import
com.yeejoin.amos.boot.module.ugp.api.entity.Verify
;
import
org.apache.ibatis.annotations.Mapper
;
/**
* 页面路径表(TzUgpPath)表数据库访问层
*
* @author makejava
* @since 2022-12-09 18:52:40
*/
@Mapper
public
interface
TzUgpPathDao
extends
BaseMapper
<
TzUgpPath
>
{
}
\ No newline at end of file
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/service/TzUgpPathService.java
0 → 100644
View file @
23a4a517
package
com
.
yeejoin
.
amos
.
boot
.
module
.
ugp
.
api
.
service
;
/**
* 页面路径表(TzUgpPath)表服务接口
*
* @author makejava
* @since 2022-12-09 18:52:41
*/
public
interface
TzUgpPathService
{
}
\ No newline at end of file
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/TzUgpPathDao.xml
0 → 100644
View file @
23a4a517
<?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">
<mapper
namespace=
".dao.TzUgpPathDao"
>
<resultMap
id=
"BaseResultMap"
type=
".entity.TzUgpPath"
>
<!--@Table tz_ugp_path-->
<result
property=
"sequenceNbr"
column=
"sequence_nbr"
jdbcType=
"INTEGER"
/>
<result
property=
"name"
column=
"name"
jdbcType=
"VARCHAR"
/>
<result
property=
"url"
column=
"url"
jdbcType=
"VARCHAR"
/>
<result
property=
"status"
column=
"status"
jdbcType=
"INTEGER"
/>
<result
property=
"recUserId"
column=
"rec_user_id"
jdbcType=
"INTEGER"
/>
<result
property=
"recDate"
column=
"rec_date"
jdbcType=
"TIMESTAMP"
/>
<result
property=
"isDelete"
column=
"is_delete"
jdbcType=
"INTEGER"
/>
<result
property=
"recUserName"
column=
"rec_user_name"
jdbcType=
"VARCHAR"
/>
</resultMap>
<!--查询单个-->
<select
id=
"queryById"
resultMap=
"BaseResultMap"
>
select
sequence_nbr, name, url, status, rec_user_id, rec_date, is_delete, rec_user_name
from ugp_amos_ugp_biz.tz_ugp_path
where = #{}
</select>
<!--查询指定行数据-->
<select
id=
"queryAllByLimit"
resultMap=
"BaseResultMap"
>
select
sequence_nbr, name, url, status, rec_user_id, rec_date, is_delete, rec_user_name
from ugp_amos_ugp_biz.tz_ugp_path
limit #{offset}, #{limit}
</select>
<!--通过实体作为筛选条件查询-->
<select
id=
"queryAll"
resultMap=
"BaseResultMap"
>
select
sequence_nbr, name, url, status, rec_user_id, rec_date, is_delete, rec_user_name
from ugp_amos_ugp_biz.tz_ugp_path
<where>
<if
test=
"sequenceNbr != null"
>
and sequence_nbr = #{sequenceNbr}
</if>
<if
test=
"name != null and name != ''"
>
and name = #{name}
</if>
<if
test=
"url != null and url != ''"
>
and url = #{url}
</if>
<if
test=
"status != null"
>
and status = #{status}
</if>
<if
test=
"recUserId != null"
>
and rec_user_id = #{recUserId}
</if>
<if
test=
"recDate != null"
>
and rec_date = #{recDate}
</if>
<if
test=
"isDelete != null"
>
and is_delete = #{isDelete}
</if>
<if
test=
"recUserName != null and recUserName != ''"
>
and rec_user_name = #{recUserName}
</if>
</where>
</select>
<!--新增所有列-->
<insert
id=
"insert"
keyProperty=
""
useGeneratedKeys=
"true"
>
insert into ugp_amos_ugp_biz.tz_ugp_path(sequence_nbr, name, url, status, rec_user_id, rec_date, is_delete, rec_user_name)
values (#{sequenceNbr}, #{name}, #{url}, #{status}, #{recUserId}, #{recDate}, #{isDelete}, #{recUserName})
</insert>
<!--通过主键修改数据-->
<update
id=
"update"
>
update ugp_amos_ugp_biz.tz_ugp_path
<set>
<if
test=
"sequenceNbr != null"
>
sequence_nbr = #{sequenceNbr},
</if>
<if
test=
"name != null and name != ''"
>
name = #{name},
</if>
<if
test=
"url != null and url != ''"
>
url = #{url},
</if>
<if
test=
"status != null"
>
status = #{status},
</if>
<if
test=
"recUserId != null"
>
rec_user_id = #{recUserId},
</if>
<if
test=
"recDate != null"
>
rec_date = #{recDate},
</if>
<if
test=
"isDelete != null"
>
is_delete = #{isDelete},
</if>
<if
test=
"recUserName != null and recUserName != ''"
>
rec_user_name = #{recUserName},
</if>
</set>
where = #{}
</update>
<!--通过主键删除-->
<delete
id=
"deleteById"
>
delete from ugp_amos_ugp_biz.tz_ugp_path where = #{}
</delete>
</mapper>
\ No newline at end of file
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/TzUgpPathController.java
0 → 100644
View file @
23a4a517
package
com
.
yeejoin
.
amos
.
boot
.
module
.
ugp
.
biz
.
controller
;
import
org.springframework.web.bind.annotation.*
;
/**
* 页面路径表(TzUgpPath)表控制层
*
* @author makejava
* @since 2022-12-09 18:52:42
*/
@RestController
@RequestMapping
(
"/tzUgpPath"
)
public
class
TzUgpPathController
{
}
\ No newline at end of file
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/CompanyServiceImpl.java
View file @
23a4a517
...
@@ -163,9 +163,6 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
...
@@ -163,9 +163,6 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
return
true
;
return
true
;
}
}
public
Boolean
companyCheck
(
CompanyDto
model
,
Long
sequenceNbr
,
String
bizOrgType
)
throws
Exception
{
public
Boolean
companyCheck
(
CompanyDto
model
,
Long
sequenceNbr
,
String
bizOrgType
)
throws
Exception
{
Set
<
String
>
roleNameSet
=
new
HashSet
<>();
Set
<
String
>
roleNameSet
=
new
HashSet
<>();
List
<
RoleModel
>
userRoleList
=
new
ArrayList
<>();
List
<
RoleModel
>
userRoleList
=
new
ArrayList
<>();
...
@@ -211,7 +208,6 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
...
@@ -211,7 +208,6 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
userRoleList
.
add
(
r
);
userRoleList
.
add
(
r
);
}
}
});
});
userRoleList
.
stream
().
forEach
(
r
->
{
userRoleList
.
stream
().
forEach
(
r
->
{
roleIds
.
add
(
r
.
getSequenceNbr
());
roleIds
.
add
(
r
.
getSequenceNbr
());
});
});
...
@@ -254,7 +250,6 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
...
@@ -254,7 +250,6 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
return
this
.
updateById
(
company
);
return
this
.
updateById
(
company
);
}
}
public
CompanyDto
queryBySeq1
(
Long
sequenceNbr
)
{
public
CompanyDto
queryBySeq1
(
Long
sequenceNbr
)
{
return
companyMapper
.
queryBySeq1
(
sequenceNbr
);
return
companyMapper
.
queryBySeq1
(
sequenceNbr
);
}
}
...
...
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProjectInitiationServiceImpl.java
View file @
23a4a517
...
@@ -256,7 +256,6 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
...
@@ -256,7 +256,6 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
wps
.
setTemperature_time
(
json
.
getDouble
(
"wps_temperature_time"
));
wps
.
setTemperature_time
(
json
.
getDouble
(
"wps_temperature_time"
));
wps
.
setMaterial_minT_of_a_b_thickness
(
json
.
getDouble
(
"wps_material_minT_of_a_b_thickness"
));
wps
.
setMaterial_minT_of_a_b_thickness
(
json
.
getDouble
(
"wps_material_minT_of_a_b_thickness"
));
HashMap
<
String
,
String
>
stringStringHashMap
=
new
WeldingQualification
(
).
equipmentWeldingQualification
(
pqr
,
wps
);
HashMap
<
String
,
String
>
stringStringHashMap
=
new
WeldingQualification
(
).
equipmentWeldingQualification
(
pqr
,
wps
);
...
...
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/TaskServiceImpl.java
View file @
23a4a517
This diff is collapsed.
Click to expand it.
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/TzUgpPathServiceImpl.java
0 → 100644
View file @
23a4a517
package
com
.
yeejoin
.
amos
.
boot
.
module
.
ugp
.
biz
.
service
.
impl
;
import
com.yeejoin.amos.boot.module.ugp.api.dto.TzUgpPathDto
;
import
com.yeejoin.amos.boot.module.ugp.api.entity.TzUgpPath
;
import
com.yeejoin.amos.boot.module.ugp.api.mapper.TzUgpPathDao
;
import
com.yeejoin.amos.boot.module.ugp.api.service.TzUgpPathService
;
import
org.springframework.stereotype.Service
;
import
org.typroject.tyboot.core.rdbms.service.BaseService
;
import
javax.annotation.Resource
;
import
java.util.List
;
/**
* 页面路径表(TzUgpPath)表服务实现类
*
* @author makejava
* @since 2022-12-09 18:52:42
*/
@Service
public
class
TzUgpPathServiceImpl
extends
BaseService
<
TzUgpPathDto
,
TzUgpPath
,
TzUgpPathDao
>
implements
TzUgpPathService
{
}
\ 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