Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
W
work_service
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
licc
work_service
Commits
02912147
Commit
02912147
authored
Feb 10, 2021
by
cq990612
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化代码结构
parent
ede4b209
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
56 additions
and
15 deletions
+56
-15
BASE_RESP_CODE_ENUM.java
...wisenergy/common/utils/exception/BASE_RESP_CODE_ENUM.java
+1
-1
WorkProjectChangeMapper.xml
...per/src/main/resources/mapper/WorkProjectChangeMapper.xml
+4
-4
WorkProjectChange.java
...c/main/java/cn/wisenergy/model/app/WorkProjectChange.java
+4
-3
ChangeTypeEnum.java
...rc/main/java/cn/wisenergy/model/enums/ChangeTypeEnum.java
+31
-0
WorkProjectChangeServiceImpl.java
.../wisenergy/service/impl/WorkProjectChangeServiceImpl.java
+9
-0
WorkProjectServiceImpl.java
...ava/cn/wisenergy/service/impl/WorkProjectServiceImpl.java
+4
-4
WorkUserServiceImpl.java
...n/java/cn/wisenergy/service/impl/WorkUserServiceImpl.java
+1
-1
SystemController.java
.../wisenergy/web/admin/controller/app/SystemController.java
+1
-1
WorkProjectController.java
...nergy/web/admin/controller/app/WorkProjectController.java
+1
-1
No files found.
wisenergy-common/src/main/java/cn/wisenergy/common/utils/exception/BASE_RESP_CODE_ENUM.java
View file @
02912147
...
@@ -72,7 +72,7 @@ public enum BASE_RESP_CODE_ENUM {
...
@@ -72,7 +72,7 @@ public enum BASE_RESP_CODE_ENUM {
REASON_CANNOT_BE_EMPTY
(
"650"
,
"更变原因不能为空"
),
REASON_CANNOT_BE_EMPTY
(
"650"
,
"更变原因不能为空"
),
START_NOT_THAN_END_DATE
(
"651"
,
"开始时间不能大于结束时间"
),
START_NOT_THAN_END_DATE
(
"651"
,
"开始时间不能大于结束时间"
),
HOLIDAY_NOT_IS_NULL
(
"652"
,
"该节假日已经不存在,请刷新页面!"
),
HOLIDAY_NOT_IS_NULL
(
"652"
,
"该节假日已经不存在,请刷新页面!"
),
ORDINARY_MEMBERS_ARE_MANAGEMENT
(
"653"
,
"普通成员不能有管理角色
,请取消普通成员选项
"
),
ORDINARY_MEMBERS_ARE_MANAGEMENT
(
"653"
,
"普通成员不能有管理角色"
),
REPEAT_WITH_OLDTIME
(
"654"
,
"日期与旧时间冲突"
),
REPEAT_WITH_OLDTIME
(
"654"
,
"日期与旧时间冲突"
),
BUDGET_CANNOT_BELESSTHAN_ZERO
(
"655"
,
"预算不能小于0"
),
BUDGET_CANNOT_BELESSTHAN_ZERO
(
"655"
,
"预算不能小于0"
),
ITEMOADUPLICATE
(
"656"
,
"项目OA重复"
),
ITEMOADUPLICATE
(
"656"
,
"项目OA重复"
),
...
...
wisenergy-mapper/src/main/resources/mapper/WorkProjectChangeMapper.xml
View file @
02912147
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
<resultMap
id=
"BaseResultMap"
type=
"cn.wisenergy.model.app.WorkProjectChange"
>
<resultMap
id=
"BaseResultMap"
type=
"cn.wisenergy.model.app.WorkProjectChange"
>
<id
column=
"id"
property=
"id"
/>
<id
column=
"id"
property=
"id"
/>
<result
column=
"project_id"
property=
"projectId"
/>
<result
column=
"project_id"
property=
"projectId"
/>
<result
column=
"
type"
property=
"t
ype"
/>
<result
column=
"
change_type"
property=
"changeT
ype"
/>
<result
column=
"modify_after"
property=
"modifyAfter"
/>
<result
column=
"modify_after"
property=
"modifyAfter"
/>
<result
column=
"modify_before"
property=
"modifyBefore"
/>
<result
column=
"modify_before"
property=
"modifyBefore"
/>
<result
column=
"reason"
property=
"reason"
/>
<result
column=
"reason"
property=
"reason"
/>
...
@@ -15,18 +15,18 @@
...
@@ -15,18 +15,18 @@
<!-- 通用查询结果列 -->
<!-- 通用查询结果列 -->
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
id, project_id,
`type`
, modify_after,modify_before, reason, modify_time
id, project_id,
change_type
, modify_after,modify_before, reason, modify_time
</sql>
</sql>
<sql
id=
"not_id_Column_List"
>
<sql
id=
"not_id_Column_List"
>
project_id,
`type`
, modify_after,modify_before, reason, modify_time
project_id,
change_type
, modify_after,modify_before, reason, modify_time
</sql>
</sql>
<insert
id=
"insertBatch"
>
<insert
id=
"insertBatch"
>
INSERT INTO work_project_change
INSERT INTO work_project_change
(
<include
refid=
"not_id_Column_List"
/>
)
(
<include
refid=
"not_id_Column_List"
/>
)
VALUES
VALUES
<foreach
collection =
"workProjectChanges"
item=
"workProjectChange"
separator =
","
>
<foreach
collection =
"workProjectChanges"
item=
"workProjectChange"
separator =
","
>
(#{workProjectChange.projectId}, #{workProjectChange.
t
ype},#{workProjectChange.modifyAfter},#{workProjectChange.modifyBefore},#{workProjectChange.reason},#{workProjectChange.modifyTime})
(#{workProjectChange.projectId}, #{workProjectChange.
changeT
ype},#{workProjectChange.modifyAfter},#{workProjectChange.modifyBefore},#{workProjectChange.reason},#{workProjectChange.modifyTime})
</foreach >
</foreach >
...
...
wisenergy-model/src/main/java/cn/wisenergy/model/app/WorkProjectChange.java
View file @
02912147
...
@@ -35,8 +35,8 @@ public class WorkProjectChange implements Serializable {
...
@@ -35,8 +35,8 @@ public class WorkProjectChange implements Serializable {
@ApiModelProperty
(
name
=
"projectId;"
,
value
=
"项目编号"
)
@ApiModelProperty
(
name
=
"projectId;"
,
value
=
"项目编号"
)
private
Integer
projectId
;
private
Integer
projectId
;
@ApiModelProperty
(
name
=
"
t
ype"
,
value
=
"1:成本预算变更,2:工时预算变更"
)
@ApiModelProperty
(
name
=
"
changeT
ype"
,
value
=
"1:成本预算变更,2:工时预算变更"
)
private
Integer
t
ype
;
private
Integer
changeT
ype
;
@ApiModelProperty
(
name
=
"modifyAfter"
,
value
=
"修改后的预算"
)
@ApiModelProperty
(
name
=
"modifyAfter"
,
value
=
"修改后的预算"
)
private
String
modifyAfter
;
private
String
modifyAfter
;
...
@@ -52,6 +52,7 @@ public class WorkProjectChange implements Serializable {
...
@@ -52,6 +52,7 @@ public class WorkProjectChange implements Serializable {
private
Date
modifyTime
;
private
Date
modifyTime
;
/** 附加字段 更变项名*/
private
String
changeTypeName
;
}
}
wisenergy-model/src/main/java/cn/wisenergy/model/enums/ChangeTypeEnum.java
0 → 100644
View file @
02912147
package
cn
.
wisenergy
.
model
.
enums
;
/**
* @Authotr:陈奇
* @QQ1799796883
*/
public
enum
ChangeTypeEnum
{
COSTBUDGET
(
1
,
"成本预算"
),
WORKINGHOURSBUDGET
(
2
,
"工时预算"
),
STARTINGTIME
(
3
,
"开始时间"
),
ENDTIME
(
4
,
"结束时间"
),
;
private
Integer
changeType
;
private
String
changeTypeName
;
ChangeTypeEnum
(
Integer
changeType
,
String
changeTypeName
)
{
this
.
changeType
=
changeType
;
this
.
changeTypeName
=
changeTypeName
;
}
public
Integer
getChangeType
()
{
return
changeType
;
}
public
String
getChangeTypeName
()
{
return
changeTypeName
;
}}
wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkProjectChangeServiceImpl.java
View file @
02912147
...
@@ -4,6 +4,7 @@ import cn.wisenergy.common.utils.exception.BASE_RESP_CODE_ENUM;
...
@@ -4,6 +4,7 @@ import cn.wisenergy.common.utils.exception.BASE_RESP_CODE_ENUM;
import
cn.wisenergy.common.utils.exception.BaseCustomException
;
import
cn.wisenergy.common.utils.exception.BaseCustomException
;
import
cn.wisenergy.mapper.WorkProjectChangeMapper
;
import
cn.wisenergy.mapper.WorkProjectChangeMapper
;
import
cn.wisenergy.model.app.WorkProjectChange
;
import
cn.wisenergy.model.app.WorkProjectChange
;
import
cn.wisenergy.model.enums.ChangeTypeEnum
;
import
cn.wisenergy.service.WorkProjectChangeService
;
import
cn.wisenergy.service.WorkProjectChangeService
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -59,6 +60,14 @@ public class WorkProjectChangeServiceImpl implements WorkProjectChangeService {
...
@@ -59,6 +60,14 @@ public class WorkProjectChangeServiceImpl implements WorkProjectChangeService {
if
(
CollectionUtils
.
isEmpty
(
workProjectChanges
))
{
if
(
CollectionUtils
.
isEmpty
(
workProjectChanges
))
{
return
null
;
return
null
;
}
}
// 给ChangeTypeName赋值
for
(
WorkProjectChange
workProjectChange
:
workProjectChanges
)
{
for
(
ChangeTypeEnum
value
:
ChangeTypeEnum
.
values
())
{
if
(
value
.
getChangeType
().
equals
(
workProjectChange
.
getChangeType
()))
{
workProjectChange
.
setChangeTypeName
(
value
.
getChangeTypeName
());
}
}
}
return
workProjectChanges
;
return
workProjectChanges
;
}
}
}
}
wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkProjectServiceImpl.java
View file @
02912147
...
@@ -318,28 +318,28 @@ public class WorkProjectServiceImpl implements WorkProjectService {
...
@@ -318,28 +318,28 @@ public class WorkProjectServiceImpl implements WorkProjectService {
workProjectChange
.
setProjectId
(
modifyProjectVo
.
getProjectId
());
workProjectChange
.
setProjectId
(
modifyProjectVo
.
getProjectId
());
workProjectChange
.
setModifyTime
(
new
Date
());
workProjectChange
.
setModifyTime
(
new
Date
());
if
(
null
!=
modifyProjectVo
.
getStartTimeReason
())
{
if
(
null
!=
modifyProjectVo
.
getStartTimeReason
())
{
workProjectChange
.
setType
(
3
);
workProjectChange
.
set
Change
Type
(
3
);
workProjectChange
.
setModifyBefore
(
DateUtil
.
convertDateToStr
(
modifyProjectVo
.
getStartTime
(),
"yyyy-MM-dd"
));
workProjectChange
.
setModifyBefore
(
DateUtil
.
convertDateToStr
(
modifyProjectVo
.
getStartTime
(),
"yyyy-MM-dd"
));
workProjectChange
.
setModifyAfter
(
DateUtil
.
convertDateToStr
(
modifyProjectVo
.
getStartTime
(),
"yyyy-MM-dd"
));
workProjectChange
.
setModifyAfter
(
DateUtil
.
convertDateToStr
(
modifyProjectVo
.
getStartTime
(),
"yyyy-MM-dd"
));
workProjectChange
.
setReason
(
modifyProjectVo
.
getStartTimeReason
());
workProjectChange
.
setReason
(
modifyProjectVo
.
getStartTimeReason
());
workProjectChanges
.
add
(
workProjectChange
);
workProjectChanges
.
add
(
workProjectChange
);
}
}
if
(
null
!=
modifyProjectVo
.
getEndTime
())
{
if
(
null
!=
modifyProjectVo
.
getEndTime
())
{
workProjectChange
.
setType
(
4
);
workProjectChange
.
set
Change
Type
(
4
);
workProjectChange
.
setModifyBefore
(
DateUtil
.
convertDateToStr
(
modifyProjectVo
.
getEndTime
(),
"yyyy-MM-dd"
));
workProjectChange
.
setModifyBefore
(
DateUtil
.
convertDateToStr
(
modifyProjectVo
.
getEndTime
(),
"yyyy-MM-dd"
));
workProjectChange
.
setModifyAfter
(
modifyProjectVo
.
getEndTime
().
toString
());
workProjectChange
.
setModifyAfter
(
modifyProjectVo
.
getEndTime
().
toString
());
workProjectChange
.
setReason
(
modifyProjectVo
.
getEndTimeReason
());
workProjectChange
.
setReason
(
modifyProjectVo
.
getEndTimeReason
());
workProjectChanges
.
add
(
workProjectChange
);
workProjectChanges
.
add
(
workProjectChange
);
}
}
if
(
null
!=
modifyProjectVo
.
getWorkTime
())
{
if
(
null
!=
modifyProjectVo
.
getWorkTime
())
{
workProjectChange
.
setType
(
2
);
workProjectChange
.
set
Change
Type
(
2
);
workProjectChange
.
setModifyBefore
(
workProject
.
getWorkTime
().
toString
());
workProjectChange
.
setModifyBefore
(
workProject
.
getWorkTime
().
toString
());
workProjectChange
.
setModifyAfter
(
modifyProjectVo
.
getWorkTime
().
toString
());
workProjectChange
.
setModifyAfter
(
modifyProjectVo
.
getWorkTime
().
toString
());
workProjectChange
.
setReason
(
modifyProjectVo
.
getWorkTimeReason
());
workProjectChange
.
setReason
(
modifyProjectVo
.
getWorkTimeReason
());
workProjectChanges
.
add
(
workProjectChange
);
workProjectChanges
.
add
(
workProjectChange
);
}
}
if
(
null
!=
modifyProjectVo
.
getCostBudget
())
{
if
(
null
!=
modifyProjectVo
.
getCostBudget
())
{
workProjectChange
.
setType
(
1
);
workProjectChange
.
set
Change
Type
(
1
);
workProjectChange
.
setModifyBefore
(
workProject
.
getCostBudget
().
toString
());
workProjectChange
.
setModifyBefore
(
workProject
.
getCostBudget
().
toString
());
workProjectChange
.
setModifyAfter
(
modifyProjectVo
.
getCostBudget
().
toString
());
workProjectChange
.
setModifyAfter
(
modifyProjectVo
.
getCostBudget
().
toString
());
workProjectChange
.
setReason
(
modifyProjectVo
.
getCostBudgetReason
());
workProjectChange
.
setReason
(
modifyProjectVo
.
getCostBudgetReason
());
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkUserServiceImpl.java
View file @
02912147
...
@@ -151,7 +151,7 @@ public class WorkUserServiceImpl implements WorkUserService {
...
@@ -151,7 +151,7 @@ public class WorkUserServiceImpl implements WorkUserService {
public
AllRoleAndUserRoleDto
getUserRoleDto
(
Integer
userId
,
Integer
page
,
Integer
pageSize
)
{
public
AllRoleAndUserRoleDto
getUserRoleDto
(
Integer
userId
,
Integer
page
,
Integer
pageSize
)
{
log
.
info
(
"WorkUserServiceImpl[]getUserRoleDto[]input.param.userId:{},page:{},pageSize:{}"
+
userId
,
page
,
pageSize
);
log
.
info
(
"WorkUserServiceImpl[]getUserRoleDto[]input.param.userId:{},page:{},pageSize:{}"
+
userId
,
page
,
pageSize
);
if
(!
UserRoleLevelUtils
.
isManagerLevel
(
userId
,
LevelEnum
.
ACCOUNTMANAGEMENT
.
getLevelName
()))
{
if
(!
UserRoleLevelUtils
.
isManagerLevel
(
userId
,
LevelEnum
.
ACCOUNTMANAGEMENT
.
getLevelName
()))
{
throw
new
BaseCustomException
(
BASE_RESP_CODE_ENUM
.
MANAGER_NOT_PROJECT
);
throw
new
BaseCustomException
(
BASE_RESP_CODE_ENUM
.
THE_USER_NOT_MANAGER_PLASE_MANAGER_LOGIN
);
}
}
page
=
page
==
null
?
1
:
page
;
page
=
page
==
null
?
1
:
page
;
pageSize
=
pageSize
==
null
?
10
:
pageSize
;
pageSize
=
pageSize
==
null
?
10
:
pageSize
;
...
...
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/SystemController.java
View file @
02912147
...
@@ -79,7 +79,7 @@ public class SystemController extends BaseController {
...
@@ -79,7 +79,7 @@ public class SystemController extends BaseController {
}
}
@ApiOperation
(
value
=
"修改审批时限"
,
notes
=
"修改审批时限"
,
httpMethod
=
"PUT"
)
@ApiOperation
(
value
=
"修改审批时限"
,
notes
=
"修改审批时限"
,
httpMethod
=
"PUT"
)
@ApiImplicitParam
(
name
=
"workSubmitAdopt"
,
value
=
"审批时限"
,
required
=
true
)
@ApiImplicitParam
(
name
=
"workSubmitAdopt"
,
value
=
"审批时限"
,
dataType
=
"WorkSubmitAdopt"
,
required
=
true
)
@PutMapping
(
"/modifyAuto"
)
@PutMapping
(
"/modifyAuto"
)
public
Result
<
Boolean
>
modifyAuto
(
@RequestBody
WorkSubmitAdopt
workSubmitAdopt
)
{
public
Result
<
Boolean
>
modifyAuto
(
@RequestBody
WorkSubmitAdopt
workSubmitAdopt
)
{
log
.
info
(
"SystemController[]modifyAuto[]input.param.workSubmitAdopt:{}"
+
workSubmitAdopt
);
log
.
info
(
"SystemController[]modifyAuto[]input.param.workSubmitAdopt:{}"
+
workSubmitAdopt
);
...
...
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/WorkProjectController.java
View file @
02912147
...
@@ -42,7 +42,7 @@ public class WorkProjectController extends BaseController {
...
@@ -42,7 +42,7 @@ public class WorkProjectController extends BaseController {
@PostMapping
(
value
=
"/getProject"
)
@PostMapping
(
value
=
"/getProject"
)
public
Result
<
PageInfo
>
getProject
(
@RequestBody
GetManagerProjectsVo
gmpv
)
{
public
Result
<
PageInfo
>
getProject
(
@RequestBody
GetManagerProjectsVo
gmpv
)
{
log
.
info
(
"WorkProjectController[]getProject[]input.param.GetManagerProjectsVo:{}"
+
gmpv
);
log
.
info
(
"WorkProjectController[]getProject[]input.param.GetManagerProjectsVo:{}"
+
gmpv
);
PageInfo
<
ManagerProjectsDto
>
managerProjeets
=
workProjectService
.
getManagerProjects
(
gmpv
);
PageInfo
managerProjeets
=
workProjectService
.
getManagerProjects
(
gmpv
);
return
getResult
(
managerProjeets
);
return
getResult
(
managerProjeets
);
}
}
...
...
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