Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vehicle-quality-review
Project
Project
Details
Activity
Releases
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
王飞
vehicle-quality-review
Commits
f39a8caa
Commit
f39a8caa
authored
Feb 27, 2024
by
高滢
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://gitlab.91isoft.com:90/wangfei/vehicle-quality-review
into gaoying
parents
3d6caf0a
85173e53
Changes
20
Show whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
365 additions
and
14 deletions
+365
-14
ReviewDetailsResult.java
...w/src/main/java/com/ruoyi/domain/ReviewDetailsResult.java
+13
-0
ReviewEnterpriseArchive.java
...c/main/java/com/ruoyi/domain/ReviewEnterpriseArchive.java
+16
-0
ReviewEnterpriseArchiveMapper.java
.../java/com/ruoyi/mapper/ReviewEnterpriseArchiveMapper.java
+9
-0
ReviewEnterpriseArchiveService.java
...ava/com/ruoyi/service/ReviewEnterpriseArchiveService.java
+21
-0
StandardService.java
...view/src/main/java/com/ruoyi/service/StandardService.java
+3
-0
ReviewDetailsResultServiceImpl.java
...om/ruoyi/service/impl/ReviewDetailsResultServiceImpl.java
+2
-0
ReviewEnterpriseArchiveServiceImpl.java
...uoyi/service/impl/ReviewEnterpriseArchiveServiceImpl.java
+54
-0
StandardServiceImpl.java
...main/java/com/ruoyi/service/impl/StandardServiceImpl.java
+6
-0
StrategyCarReviewTaskPending.java
.../com/ruoyi/service/impl/StrategyCarReviewTaskPending.java
+22
-0
StrategySystemReviewTaskPending.java
...m/ruoyi/service/impl/StrategySystemReviewTaskPending.java
+23
-4
ReviewEnterpriseArchiveController.java
...java/com/ruoyi/web/ReviewEnterpriseArchiveController.java
+79
-0
StandardController.java
...eview/src/main/java/com/ruoyi/web/StandardController.java
+12
-4
ReviewDetailsResultSaveRequest.java
...com/ruoyi/web/request/ReviewDetailsResultSaveRequest.java
+6
-0
ReviewEnterpriseArchiveFindFileNameListRequest.java
...quest/ReviewEnterpriseArchiveFindFileNameListRequest.java
+14
-0
ReviewEnterpriseArchiveFindRequest.java
...ruoyi/web/request/ReviewEnterpriseArchiveFindRequest.java
+20
-0
ReviewEnterpriseArchiveGetInfoRequest.java
...yi/web/request/ReviewEnterpriseArchiveGetInfoRequest.java
+13
-0
StandardGetInfoRequest.java
...in/java/com/ruoyi/web/request/StandardGetInfoRequest.java
+12
-0
ReviewDetailsResultMapper.xml
...w/src/main/resources/mapper/ReviewDetailsResultMapper.xml
+5
-2
ReviewEnterpriseArchiveMapper.xml
...c/main/resources/mapper/ReviewEnterpriseArchiveMapper.xml
+33
-2
TaskMapper.xml
quality-review/src/main/resources/mapper/TaskMapper.xml
+2
-2
No files found.
quality-review/src/main/java/com/ruoyi/domain/ReviewDetailsResult.java
View file @
f39a8caa
package
com
.
ruoyi
.
domain
;
package
com
.
ruoyi
.
domain
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
java.io.Serializable
;
import
java.io.Serializable
;
...
@@ -78,4 +79,16 @@ public class ReviewDetailsResult implements Serializable {
...
@@ -78,4 +79,16 @@ public class ReviewDetailsResult implements Serializable {
@ApiModelProperty
(
"最后修改时间"
)
@ApiModelProperty
(
"最后修改时间"
)
private
Date
lastModifyTime
;
private
Date
lastModifyTime
;
@ApiModelProperty
(
"文件目录"
)
private
String
catalogue
;
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
)
@ApiModelProperty
(
"关联到车企留档文件"
)
private
Long
reviewEnterpriseArchiveId
;
@TableField
(
exist
=
false
)
@ApiModelProperty
(
"企业名称"
)
private
String
enterpriseName
;
}
}
quality-review/src/main/java/com/ruoyi/domain/ReviewEnterpriseArchive.java
View file @
f39a8caa
...
@@ -27,46 +27,62 @@ public class ReviewEnterpriseArchive implements Serializable {
...
@@ -27,46 +27,62 @@ public class ReviewEnterpriseArchive implements Serializable {
/**
/**
* 企业名称
* 企业名称
*/
*/
@ApiModelProperty
(
"企业名称"
)
private
String
enterpriseName
;
private
String
enterpriseName
;
/**
/**
* 文件名称
* 文件名称
*/
*/
@ApiModelProperty
(
"文件名称"
)
private
String
fileName
;
private
String
fileName
;
/**
/**
* 文件版本
* 文件版本
*/
*/
@ApiModelProperty
(
"文件版本"
)
private
String
version
;
private
String
version
;
/**
/**
* 发布日期
* 发布日期
*/
*/
@ApiModelProperty
(
"发布日期"
)
private
Date
publishDate
;
private
Date
publishDate
;
/**
/**
* 文件状态
* 文件状态
*/
*/
@ApiModelProperty
(
"文件状态"
)
private
String
status
;
private
String
status
;
/**
/**
* 文件识别号
* 文件识别号
*/
*/
@ApiModelProperty
(
"文件识别号"
)
private
String
identifyNumber
;
private
String
identifyNumber
;
/**
/**
* 存储位置
* 存储位置
*/
*/
@ApiModelProperty
(
"存储位置"
)
private
String
storage
;
private
String
storage
;
/**
/**
* 图片地址
* 图片地址
*/
*/
@ApiModelProperty
(
"图片地址"
)
private
String
photo
;
private
String
photo
;
/**
/**
* 关联到任务id
* 关联到任务id
*/
*/
@ApiModelProperty
(
"关联到任务id"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
)
private
Long
taskId
;
private
Long
taskId
;
@ApiModelProperty
(
"创建人"
)
private
String
createBy
;
@ApiModelProperty
(
"创建时间"
)
private
Date
createTime
;
}
}
\ No newline at end of file
quality-review/src/main/java/com/ruoyi/mapper/ReviewEnterpriseArchiveMapper.java
View file @
f39a8caa
...
@@ -3,6 +3,7 @@ package com.ruoyi.mapper;
...
@@ -3,6 +3,7 @@ package com.ruoyi.mapper;
import
com.ruoyi.domain.ReviewEnterpriseArchive
;
import
com.ruoyi.domain.ReviewEnterpriseArchive
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.ruoyi.domain.vo.ReviewEnterpriseArchiveViewItemVO
;
import
com.ruoyi.domain.vo.ReviewEnterpriseArchiveViewItemVO
;
import
com.ruoyi.web.request.ReviewEnterpriseArchiveFindRequest
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Param
;
import
org.springframework.stereotype.Repository
;
import
org.springframework.stereotype.Repository
;
...
@@ -20,6 +21,14 @@ public interface ReviewEnterpriseArchiveMapper extends BaseMapper<ReviewEnterpri
...
@@ -20,6 +21,14 @@ public interface ReviewEnterpriseArchiveMapper extends BaseMapper<ReviewEnterpri
List
<
ReviewEnterpriseArchive
>
findByTaskId
(
@Param
(
"taskId"
)
Long
taskId
);
List
<
ReviewEnterpriseArchive
>
findByTaskId
(
@Param
(
"taskId"
)
Long
taskId
);
List
<
ReviewEnterpriseArchiveViewItemVO
>
findViewItemVOByTaskId
(
@Param
(
"taskId"
)
Long
taskId
);
List
<
ReviewEnterpriseArchiveViewItemVO
>
findViewItemVOByTaskId
(
@Param
(
"taskId"
)
Long
taskId
);
Long
findFileName
(
@Param
(
"taskId"
)
Long
taskId
,
@Param
(
"fileName"
)
String
fileName
);
List
<
ReviewEnterpriseArchive
>
findEnterpriseArchive
(
ReviewEnterpriseArchiveFindRequest
request
);
ReviewEnterpriseArchive
findByFileName
(
@Param
(
"fileName"
)
String
fileName
);
List
<
ReviewEnterpriseArchive
>
findList
(
@Param
(
"taskId"
)
Long
taskId
);
}
}
...
...
quality-review/src/main/java/com/ruoyi/service/ReviewEnterpriseArchiveService.java
View file @
f39a8caa
...
@@ -3,6 +3,10 @@ package com.ruoyi.service;
...
@@ -3,6 +3,10 @@ package com.ruoyi.service;
import
com.ruoyi.domain.ReviewEnterpriseArchive
;
import
com.ruoyi.domain.ReviewEnterpriseArchive
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.ruoyi.domain.vo.ReviewEnterpriseArchiveViewVO
;
import
com.ruoyi.domain.vo.ReviewEnterpriseArchiveViewVO
;
import
com.ruoyi.web.request.ReviewEnterpriseArchiveFindFileNameListRequest
;
import
com.ruoyi.web.request.ReviewEnterpriseArchiveFindRequest
;
import
com.ruoyi.web.request.ReviewEnterpriseArchiveGetInfoRequest
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
import
java.util.List
;
...
@@ -15,4 +19,21 @@ public interface ReviewEnterpriseArchiveService extends IService<ReviewEnterpris
...
@@ -15,4 +19,21 @@ public interface ReviewEnterpriseArchiveService extends IService<ReviewEnterpris
List
<
ReviewEnterpriseArchiveViewVO
>
view
(
Long
taskId
);
List
<
ReviewEnterpriseArchiveViewVO
>
view
(
Long
taskId
);
Long
addEnterpriseArchive
(
ReviewEnterpriseArchive
reviewEnterpriseArchive
);
/**
* 分页查询
* @param request
* @return
*/
List
<
ReviewEnterpriseArchive
>
findEnterpriseArchive
(
ReviewEnterpriseArchiveFindRequest
request
);
/**
* 查看详情
* @param request
* @return
*/
ReviewEnterpriseArchive
getInfo
(
ReviewEnterpriseArchiveGetInfoRequest
request
);
List
<
ReviewEnterpriseArchive
>
findList
(
ReviewEnterpriseArchiveFindFileNameListRequest
request
);
}
}
quality-review/src/main/java/com/ruoyi/service/StandardService.java
View file @
f39a8caa
...
@@ -3,6 +3,7 @@ package com.ruoyi.service;
...
@@ -3,6 +3,7 @@ package com.ruoyi.service;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.ruoyi.domain.Standard
;
import
com.ruoyi.domain.Standard
;
import
com.ruoyi.web.request.StandardEditRequest
;
import
com.ruoyi.web.request.StandardEditRequest
;
import
com.ruoyi.web.request.StandardGetInfoRequest
;
import
com.ruoyi.web.request.StandardListRequest
;
import
com.ruoyi.web.request.StandardListRequest
;
import
java.util.List
;
import
java.util.List
;
...
@@ -19,4 +20,6 @@ public interface StandardService extends IService<Standard> {
...
@@ -19,4 +20,6 @@ public interface StandardService extends IService<Standard> {
Standard
findListById
(
Long
id
);
Standard
findListById
(
Long
id
);
void
editStandard
(
StandardEditRequest
request
);
void
editStandard
(
StandardEditRequest
request
);
Standard
getInfo
(
StandardGetInfoRequest
request
);
}
}
quality-review/src/main/java/com/ruoyi/service/impl/ReviewDetailsResultServiceImpl.java
View file @
f39a8caa
...
@@ -55,6 +55,8 @@ public class ReviewDetailsResultServiceImpl extends ServiceImpl<ReviewDetailsRes
...
@@ -55,6 +55,8 @@ public class ReviewDetailsResultServiceImpl extends ServiceImpl<ReviewDetailsRes
ReviewDetailsResult
reviewDetailsResult
=
new
ReviewDetailsResult
();
ReviewDetailsResult
reviewDetailsResult
=
new
ReviewDetailsResult
();
reviewDetailsResult
.
setTaskId
(
request
.
getTaskId
());
reviewDetailsResult
.
setTaskId
(
request
.
getTaskId
());
reviewDetailsResult
.
setReviewDetailsId
(
request
.
getReviewDetailsId
());
reviewDetailsResult
.
setReviewDetailsId
(
request
.
getReviewDetailsId
());
reviewDetailsResult
.
setReviewEnterpriseArchiveId
(
request
.
getReviewEnterpriseArchiveId
());
reviewDetailsResult
.
setCatalogue
(
request
.
getCatalogue
());
reviewDetailsResult
.
setPassed
(
request
.
getPassed
());
reviewDetailsResult
.
setPassed
(
request
.
getPassed
());
reviewDetailsResult
.
setUserId
(
loginUser
.
getUserId
());
reviewDetailsResult
.
setUserId
(
loginUser
.
getUserId
());
reviewDetailsResult
.
setUserName
(
loginUser
.
getNickName
());
reviewDetailsResult
.
setUserName
(
loginUser
.
getNickName
());
...
...
quality-review/src/main/java/com/ruoyi/service/impl/ReviewEnterpriseArchiveServiceImpl.java
View file @
f39a8caa
package
com
.
ruoyi
.
service
.
impl
;
package
com
.
ruoyi
.
service
.
impl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.ruoyi.common.constant.HttpStatus
;
import
com.ruoyi.common.core.domain.entity.SysUser
;
import
com.ruoyi.common.core.domain.model.LoginUser
;
import
com.ruoyi.common.exception.ServiceException
;
import
com.ruoyi.common.utils.SecurityUtils
;
import
com.ruoyi.domain.ReviewEnterpriseArchive
;
import
com.ruoyi.domain.ReviewEnterpriseArchive
;
import
com.ruoyi.domain.vo.ReviewEnterpriseArchiveViewItemVO
;
import
com.ruoyi.domain.vo.ReviewEnterpriseArchiveViewItemVO
;
import
com.ruoyi.domain.vo.ReviewEnterpriseArchiveViewVO
;
import
com.ruoyi.domain.vo.ReviewEnterpriseArchiveViewVO
;
import
com.ruoyi.service.ReviewEnterpriseArchiveService
;
import
com.ruoyi.service.ReviewEnterpriseArchiveService
;
import
com.ruoyi.mapper.ReviewEnterpriseArchiveMapper
;
import
com.ruoyi.mapper.ReviewEnterpriseArchiveMapper
;
import
com.ruoyi.system.service.ISysUserService
;
import
com.ruoyi.web.request.ReviewEnterpriseArchiveFindFileNameListRequest
;
import
com.ruoyi.web.request.ReviewEnterpriseArchiveFindRequest
;
import
com.ruoyi.web.request.ReviewEnterpriseArchiveGetInfoRequest
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
/**
/**
...
@@ -24,6 +34,12 @@ public class ReviewEnterpriseArchiveServiceImpl extends ServiceImpl<ReviewEnterp
...
@@ -24,6 +34,12 @@ public class ReviewEnterpriseArchiveServiceImpl extends ServiceImpl<ReviewEnterp
@Autowired
@Autowired
private
ReviewEnterpriseArchiveMapper
reviewEnterpriseArchiveMapper
;
private
ReviewEnterpriseArchiveMapper
reviewEnterpriseArchiveMapper
;
@Autowired
private
ISysUserService
sysUserService
;
@Autowired
private
ReviewEnterpriseArchiveService
reviewEnterpriseArchiveService
;
@Override
@Override
public
List
<
ReviewEnterpriseArchiveViewVO
>
view
(
Long
taskId
)
{
public
List
<
ReviewEnterpriseArchiveViewVO
>
view
(
Long
taskId
)
{
...
@@ -34,6 +50,44 @@ public class ReviewEnterpriseArchiveServiceImpl extends ServiceImpl<ReviewEnterp
...
@@ -34,6 +50,44 @@ public class ReviewEnterpriseArchiveServiceImpl extends ServiceImpl<ReviewEnterp
return
buildReviewEnterpriseArchiveViewVO
(
archives
,
viewItems
);
return
buildReviewEnterpriseArchiveViewVO
(
archives
,
viewItems
);
}
}
@Override
public
Long
addEnterpriseArchive
(
ReviewEnterpriseArchive
reviewEnterpriseArchive
)
{
LoginUser
loginUser
=
SecurityUtils
.
getLoginUser
();
SysUser
user
=
sysUserService
.
selectUserById
(
loginUser
.
getUserId
());
reviewEnterpriseArchive
.
setCreateBy
(
user
.
getNickName
());
reviewEnterpriseArchive
.
setCreateTime
(
new
Date
());
Long
sum
=
reviewEnterpriseArchiveMapper
.
findFileName
(
reviewEnterpriseArchive
.
getTaskId
(),
reviewEnterpriseArchive
.
getFileName
());
if
(
sum
>
0
)
{
throw
new
ServiceException
(
"新增文件名称重复,请检查"
,
HttpStatus
.
ERROR
);
}
else
{
reviewEnterpriseArchiveService
.
save
(
reviewEnterpriseArchive
);
}
return
reviewEnterpriseArchive
.
getId
();
}
@Override
public
List
<
ReviewEnterpriseArchive
>
findEnterpriseArchive
(
ReviewEnterpriseArchiveFindRequest
request
)
{
return
reviewEnterpriseArchiveMapper
.
findEnterpriseArchive
(
request
);
}
@Override
public
ReviewEnterpriseArchive
getInfo
(
ReviewEnterpriseArchiveGetInfoRequest
request
)
{
return
reviewEnterpriseArchiveMapper
.
selectById
(
request
.
getId
());
}
@Override
public
List
<
ReviewEnterpriseArchive
>
findList
(
ReviewEnterpriseArchiveFindFileNameListRequest
request
)
{
return
reviewEnterpriseArchiveMapper
.
findList
(
request
.
getTaskId
());
}
private
List
<
ReviewEnterpriseArchiveViewVO
>
buildReviewEnterpriseArchiveViewVO
(
List
<
ReviewEnterpriseArchive
>
archives
,
List
<
ReviewEnterpriseArchiveViewItemVO
>
viewItems
)
{
private
List
<
ReviewEnterpriseArchiveViewVO
>
buildReviewEnterpriseArchiveViewVO
(
List
<
ReviewEnterpriseArchive
>
archives
,
List
<
ReviewEnterpriseArchiveViewItemVO
>
viewItems
)
{
List
<
ReviewEnterpriseArchiveViewVO
>
viewList
=
new
ArrayList
();
List
<
ReviewEnterpriseArchiveViewVO
>
viewList
=
new
ArrayList
();
...
...
quality-review/src/main/java/com/ruoyi/service/impl/StandardServiceImpl.java
View file @
f39a8caa
...
@@ -6,6 +6,7 @@ import com.ruoyi.domain.Standard;
...
@@ -6,6 +6,7 @@ import com.ruoyi.domain.Standard;
import
com.ruoyi.mapper.StandardMapper
;
import
com.ruoyi.mapper.StandardMapper
;
import
com.ruoyi.service.StandardService
;
import
com.ruoyi.service.StandardService
;
import
com.ruoyi.web.request.StandardEditRequest
;
import
com.ruoyi.web.request.StandardEditRequest
;
import
com.ruoyi.web.request.StandardGetInfoRequest
;
import
com.ruoyi.web.request.StandardListRequest
;
import
com.ruoyi.web.request.StandardListRequest
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
@@ -48,4 +49,9 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
...
@@ -48,4 +49,9 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
BeanUtils
.
copyBeanProp
(
standard
,
request
);
BeanUtils
.
copyBeanProp
(
standard
,
request
);
standardService
.
updateById
(
standard
);
standardService
.
updateById
(
standard
);
}
}
@Override
public
Standard
getInfo
(
StandardGetInfoRequest
request
)
{
return
standardMapper
.
selectById
(
request
.
getId
());
}
}
}
quality-review/src/main/java/com/ruoyi/service/impl/StrategyCarReviewTaskPending.java
View file @
f39a8caa
...
@@ -53,6 +53,15 @@ public class StrategyCarReviewTaskPending implements StrategyCarReviewTask, Init
...
@@ -53,6 +53,15 @@ public class StrategyCarReviewTaskPending implements StrategyCarReviewTask, Init
@Autowired
@Autowired
private
ReviewTaskInboxMapper
reviewTaskInboxMapper
;
private
ReviewTaskInboxMapper
reviewTaskInboxMapper
;
@Autowired
private
TaskMapper
taskMapper
;
@Autowired
private
TaskSampleRelationMapper
taskSampleRelationMapper
;
@Autowired
private
SampleManagementMapper
sampleManagementMapper
;
// PENDING状态下
// PENDING状态下
// 1.standard字段查询当前最新问卷
// 1.standard字段查询当前最新问卷
// 2.查询场景变更任务
// 2.查询场景变更任务
...
@@ -65,6 +74,19 @@ public class StrategyCarReviewTaskPending implements StrategyCarReviewTask, Init
...
@@ -65,6 +74,19 @@ public class StrategyCarReviewTaskPending implements StrategyCarReviewTask, Init
// 获取当前问卷答案
// 获取当前问卷答案
List
<
ReviewDetailsResult
>
results
=
reviewDetailsResultService
.
findByTaskId
(
carReviewTask
.
getId
());
List
<
ReviewDetailsResult
>
results
=
reviewDetailsResultService
.
findByTaskId
(
carReviewTask
.
getId
());
// 任务样品关系
List
<
TaskSampleRelation
>
relations
=
taskSampleRelationMapper
.
selectByTaskId
(
taskMapper
.
findByCarReviewTaskId
(
carReviewTask
.
getId
()),
TaskSampleRelation
.
COMPLETE_VEHICLE_SAMPLE
);
if
(
results
.
size
()
!=
0
&&
results
!=
null
)
{
for
(
ReviewDetailsResult
reviewDetailsResult
:
results
)
{
if
(
reviewDetailsResult
!=
null
&&
reviewDetailsResult
.
getReviewEnterpriseArchiveId
()
==
null
&&
relations
.
size
()
!=
0
&&
relations
!=
null
)
{
TaskSampleRelation
taskSampleRelation
=
relations
.
get
(
0
);
Sample
sample
=
sampleManagementMapper
.
selectSampleManagementById
(
taskSampleRelation
.
getSampleId
());
reviewDetailsResult
.
setEnterpriseName
(
sample
.
getManufacturingEnterprise
());
}
}
}
// 绑定问卷与答案
// 绑定问卷与答案
setDetailsResult
(
standardTree
,
results
);
setDetailsResult
(
standardTree
,
results
);
...
...
quality-review/src/main/java/com/ruoyi/service/impl/StrategySystemReviewTaskPending.java
View file @
f39a8caa
...
@@ -5,10 +5,7 @@ import com.ruoyi.common.core.domain.entity.SysUser;
...
@@ -5,10 +5,7 @@ import com.ruoyi.common.core.domain.entity.SysUser;
import
com.ruoyi.common.exception.ServiceException
;
import
com.ruoyi.common.exception.ServiceException
;
import
com.ruoyi.common.utils.SecurityUtils
;
import
com.ruoyi.common.utils.SecurityUtils
;
import
com.ruoyi.domain.*
;
import
com.ruoyi.domain.*
;
import
com.ruoyi.mapper.ReviewDetailsMapper
;
import
com.ruoyi.mapper.*
;
import
com.ruoyi.mapper.ReviewDetailsResultMapper
;
import
com.ruoyi.mapper.ReviewTaskInboxMapper
;
import
com.ruoyi.mapper.SystemReviewTaskMapper
;
import
com.ruoyi.service.*
;
import
com.ruoyi.service.*
;
import
com.ruoyi.web.response.SystemReviewTaskViewResponse
;
import
com.ruoyi.web.response.SystemReviewTaskViewResponse
;
import
org.springframework.beans.factory.InitializingBean
;
import
org.springframework.beans.factory.InitializingBean
;
...
@@ -53,6 +50,15 @@ public class StrategySystemReviewTaskPending implements StrategySystemReviewTask
...
@@ -53,6 +50,15 @@ public class StrategySystemReviewTaskPending implements StrategySystemReviewTask
@Autowired
@Autowired
private
ReviewTaskInboxMapper
reviewTaskInboxMapper
;
private
ReviewTaskInboxMapper
reviewTaskInboxMapper
;
@Autowired
private
TaskMapper
taskMapper
;
@Autowired
private
TaskSampleRelationMapper
taskSampleRelationMapper
;
@Autowired
private
SampleManagementMapper
sampleManagementMapper
;
@Override
@Override
public
void
doStart
(
SystemReviewTask
systemReviewTask
)
{
public
void
doStart
(
SystemReviewTask
systemReviewTask
)
{
throw
new
ServiceException
(
"不能开始一个已经开始的任务"
,
HttpStatus
.
ERROR
);
throw
new
ServiceException
(
"不能开始一个已经开始的任务"
,
HttpStatus
.
ERROR
);
...
@@ -116,6 +122,19 @@ public class StrategySystemReviewTaskPending implements StrategySystemReviewTask
...
@@ -116,6 +122,19 @@ public class StrategySystemReviewTaskPending implements StrategySystemReviewTask
// 获取当前问卷答案
// 获取当前问卷答案
List
<
ReviewDetailsResult
>
results
=
reviewDetailsResultService
.
findByTaskId
(
systemReviewTask
.
getId
());
List
<
ReviewDetailsResult
>
results
=
reviewDetailsResultService
.
findByTaskId
(
systemReviewTask
.
getId
());
// 任务样品关系
List
<
TaskSampleRelation
>
relations
=
taskSampleRelationMapper
.
selectByTaskId
(
taskMapper
.
findBySystemReviewTaskId
(
systemReviewTask
.
getId
()),
TaskSampleRelation
.
COMPLETE_VEHICLE_SAMPLE
);
if
(
results
.
size
()
!=
0
&&
results
!=
null
)
{
for
(
ReviewDetailsResult
reviewDetailsResult
:
results
)
{
if
(
reviewDetailsResult
!=
null
&&
reviewDetailsResult
.
getReviewEnterpriseArchiveId
()
==
null
&&
relations
.
size
()
!=
0
&&
relations
!=
null
)
{
TaskSampleRelation
taskSampleRelation
=
relations
.
get
(
0
);
Sample
sample
=
sampleManagementMapper
.
selectSampleManagementById
(
taskSampleRelation
.
getSampleId
());
reviewDetailsResult
.
setEnterpriseName
(
sample
.
getManufacturingEnterprise
());
}
}
}
// 绑定问卷与答案
// 绑定问卷与答案
setDetailsResult
(
standardTree
,
results
);
setDetailsResult
(
standardTree
,
results
);
...
...
quality-review/src/main/java/com/ruoyi/web/ReviewEnterpriseArchiveController.java
0 → 100644
View file @
f39a8caa
package
com
.
ruoyi
.
web
;
import
com.ruoyi.common.annotation.Log
;
import
com.ruoyi.common.core.controller.BaseController
;
import
com.ruoyi.common.core.domain.R
;
import
com.ruoyi.common.core.page.TableDataInfo
;
import
com.ruoyi.common.enums.BusinessType
;
import
com.ruoyi.domain.ReviewEnterpriseArchive
;
import
com.ruoyi.service.ReviewEnterpriseArchiveService
;
import
com.ruoyi.web.request.*
;
import
com.ruoyi.web.response.TaskFindResponse
;
import
com.ruoyi.web.response.TaskGetInfoResponse
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
org.apache.skywalking.apm.toolkit.trace.Tag
;
import
org.apache.skywalking.apm.toolkit.trace.Tags
;
import
org.apache.skywalking.apm.toolkit.trace.Trace
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.springframework.web.bind.annotation.RestController
;
@Api
(
tags
=
"车企文件"
)
@RestController
@RequestMapping
(
"/review/enterprise/archive"
)
public
class
ReviewEnterpriseArchiveController
extends
BaseController
{
@Autowired
private
ReviewEnterpriseArchiveService
reviewEnterpriseArchiveService
;
@ApiOperation
(
"分页查询车企文件"
)
@Trace
@Tags
({
@Tag
(
key
=
"param"
,
value
=
"arg[0]"
),
@Tag
(
key
=
"result"
,
value
=
"returnedObj"
)})
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/findEnterpriseArchive"
)
public
TableDataInfo
<
ReviewEnterpriseArchive
>
findEnterpriseArchive
(
@Validated
@RequestBody
ReviewEnterpriseArchiveFindRequest
request
)
{
startPage
(
request
);
return
getDataTable
(
reviewEnterpriseArchiveService
.
findEnterpriseArchive
(
request
));
}
@ApiOperation
(
"根据id查询"
)
@Trace
@Tags
({
@Tag
(
key
=
"param"
,
value
=
"arg[0]"
),
@Tag
(
key
=
"result"
,
value
=
"returnedObj"
)})
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/getInfo"
)
public
R
<
ReviewEnterpriseArchive
>
getInfo
(
@Validated
@RequestBody
ReviewEnterpriseArchiveGetInfoRequest
request
)
{
ReviewEnterpriseArchive
reviewEnterpriseArchive
=
reviewEnterpriseArchiveService
.
getInfo
(
request
);
return
R
.
ok
(
reviewEnterpriseArchive
);
}
@ApiOperation
(
"查询车企文件列表"
)
@Trace
@Tags
({
@Tag
(
key
=
"param"
,
value
=
"arg[0]"
),
@Tag
(
key
=
"result"
,
value
=
"returnedObj"
)})
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/findList"
)
public
TableDataInfo
<
ReviewEnterpriseArchive
>
findList
(
@Validated
@RequestBody
ReviewEnterpriseArchiveFindFileNameListRequest
request
)
{
return
getDataTable
(
reviewEnterpriseArchiveService
.
findList
(
request
));
}
@ApiOperation
(
"新增车企文件"
)
@Trace
@Tags
({
@Tag
(
key
=
"param"
,
value
=
"arg[0]"
),
@Tag
(
key
=
"result"
,
value
=
"returnedObj"
)})
@Log
(
title
=
"车企文件"
,
businessType
=
BusinessType
.
INSERT
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/add"
)
public
R
<
Long
>
addEnterpriseArchive
(
@Validated
@RequestBody
ReviewEnterpriseArchive
reviewEnterpriseArchive
)
{
reviewEnterpriseArchiveService
.
addEnterpriseArchive
(
reviewEnterpriseArchive
);
return
R
.
ok
(
reviewEnterpriseArchive
.
getId
());
}
@ApiOperation
(
"编辑车企文件"
)
@Trace
@Tags
({
@Tag
(
key
=
"param"
,
value
=
"arg[0]"
),
@Tag
(
key
=
"result"
,
value
=
"returnedObj"
)})
@Log
(
title
=
"编辑车企文件"
,
businessType
=
BusinessType
.
UPDATE
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/edit"
)
public
R
<
String
>
editEnterpriseArchive
(
@Validated
@RequestBody
ReviewEnterpriseArchive
reviewEnterpriseArchive
)
{
reviewEnterpriseArchiveService
.
updateById
(
reviewEnterpriseArchive
);
return
R
.
ok
();
}
}
quality-review/src/main/java/com/ruoyi/web/StandardController.java
View file @
f39a8caa
...
@@ -7,11 +7,9 @@ import com.ruoyi.common.core.page.TableDataInfo;
...
@@ -7,11 +7,9 @@ import com.ruoyi.common.core.page.TableDataInfo;
import
com.ruoyi.common.enums.BusinessType
;
import
com.ruoyi.common.enums.BusinessType
;
import
com.ruoyi.domain.Standard
;
import
com.ruoyi.domain.Standard
;
import
com.ruoyi.service.StandardService
;
import
com.ruoyi.service.StandardService
;
import
com.ruoyi.web.request.ReviewSceneChangeTaskFindPendingRequest
;
import
com.ruoyi.web.request.*
;
import
com.ruoyi.web.request.StandardEditRequest
;
import
com.ruoyi.web.request.StandardListRequest
;
import
com.ruoyi.web.request.TaskEditRequest
;
import
com.ruoyi.web.response.ReviewSceneChangeTaskResponse
;
import
com.ruoyi.web.response.ReviewSceneChangeTaskResponse
;
import
com.ruoyi.web.response.TaskGetInfoResponse
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
import
org.apache.skywalking.apm.toolkit.trace.Tag
;
import
org.apache.skywalking.apm.toolkit.trace.Tag
;
...
@@ -54,4 +52,14 @@ public class StandardController extends BaseController {
...
@@ -54,4 +52,14 @@ public class StandardController extends BaseController {
standardService
.
editStandard
(
request
);
standardService
.
editStandard
(
request
);
return
R
.
ok
();
return
R
.
ok
();
}
}
@ApiOperation
(
"查看标准详情"
)
@Trace
@Tags
({
@Tag
(
key
=
"param"
,
value
=
"arg[0]"
),
@Tag
(
key
=
"result"
,
value
=
"returnedObj"
)})
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/getInfo"
)
public
R
<
Standard
>
getInfo
(
@Validated
@RequestBody
StandardGetInfoRequest
request
)
{
Standard
standard
=
standardService
.
getInfo
(
request
);
return
R
.
ok
(
standard
);
}
}
}
quality-review/src/main/java/com/ruoyi/web/request/ReviewDetailsResultSaveRequest.java
View file @
f39a8caa
...
@@ -25,4 +25,10 @@ public class ReviewDetailsResultSaveRequest {
...
@@ -25,4 +25,10 @@ public class ReviewDetailsResultSaveRequest {
*/
*/
@ApiModelProperty
(
"审核是否通过(0未通过、1通过)"
)
@ApiModelProperty
(
"审核是否通过(0未通过、1通过)"
)
private
Integer
passed
;
private
Integer
passed
;
@ApiModelProperty
(
"关联到车企留档文件"
)
private
Long
reviewEnterpriseArchiveId
;
@ApiModelProperty
(
"章节条目或范围"
)
private
String
catalogue
;
}
}
quality-review/src/main/java/com/ruoyi/web/request/ReviewEnterpriseArchiveFindFileNameListRequest.java
0 → 100644
View file @
f39a8caa
package
com
.
ruoyi
.
web
.
request
;
import
com.ruoyi.common.core.page.PageDomain
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
@ApiModel
(
value
=
"ReviewEnterpriseArchiveFindFileNameListRequest"
,
description
=
"查询文件名称列表"
)
@Data
public
class
ReviewEnterpriseArchiveFindFileNameListRequest
{
@ApiModelProperty
(
"任务id"
)
private
Long
taskId
;
}
quality-review/src/main/java/com/ruoyi/web/request/ReviewEnterpriseArchiveFindRequest.java
0 → 100644
View file @
f39a8caa
package
com
.
ruoyi
.
web
.
request
;
import
com.ruoyi.common.core.page.PageDomain
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
@ApiModel
(
value
=
"ReviewEnterpriseArchiveFindRequest"
,
description
=
"查询车企文件"
)
@Data
public
class
ReviewEnterpriseArchiveFindRequest
extends
PageDomain
{
@ApiModelProperty
(
"文件名称"
)
private
String
fileName
;
@ApiModelProperty
(
"文件状态"
)
private
String
status
;
@ApiModelProperty
(
"文件识别号"
)
private
String
identifyNumber
;
}
quality-review/src/main/java/com/ruoyi/web/request/ReviewEnterpriseArchiveGetInfoRequest.java
0 → 100644
View file @
f39a8caa
package
com
.
ruoyi
.
web
.
request
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
@ApiModel
(
value
=
"ReviewEnterpriseArchiveGetInfoRequest"
,
description
=
"根据名称查询"
)
@Data
public
class
ReviewEnterpriseArchiveGetInfoRequest
{
@ApiModelProperty
(
"id"
)
private
Long
id
;
}
quality-review/src/main/java/com/ruoyi/web/request/StandardGetInfoRequest.java
0 → 100644
View file @
f39a8caa
package
com
.
ruoyi
.
web
.
request
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
@ApiModel
(
value
=
"StandardListRequest"
,
description
=
"查询标准详情"
)
@Data
public
class
StandardGetInfoRequest
{
@ApiModelProperty
(
"ID"
)
private
Long
id
;
}
quality-review/src/main/resources/mapper/ReviewDetailsResultMapper.xml
View file @
f39a8caa
...
@@ -14,6 +14,9 @@
...
@@ -14,6 +14,9 @@
<result
property=
"userId"
column=
"user_id"
jdbcType=
"BIGINT"
/>
<result
property=
"userId"
column=
"user_id"
jdbcType=
"BIGINT"
/>
<result
property=
"userName"
column=
"user_name"
jdbcType=
"VARCHAR"
/>
<result
property=
"userName"
column=
"user_name"
jdbcType=
"VARCHAR"
/>
<result
property=
"lastModifyTime"
column=
"last_modify_time"
jdbcType=
"TIMESTAMP"
/>
<result
property=
"lastModifyTime"
column=
"last_modify_time"
jdbcType=
"TIMESTAMP"
/>
<result
property=
"catalogue"
column=
"catalogue"
jdbcType=
"VARCHAR"
/>
<result
property=
"reviewEnterpriseArchiveId"
column=
"review_enterprise_archive_id"
jdbcType=
"BIGINT"
/>
</resultMap>
</resultMap>
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
...
@@ -22,11 +25,11 @@
...
@@ -22,11 +25,11 @@
task_id from t_review_details_result
task_id from t_review_details_result
</sql>
</sql>
<select
id=
"findByTaskId"
resultType=
"com.ruoyi.domain.ReviewDetailsResult"
>
<select
id=
"findByTaskId"
resultType=
"com.ruoyi.domain.ReviewDetailsResult"
>
SELECT id, passed, comment, images_url, review_details_id, task_id, user_id, user_name, last_modify_time FROM t_review_details_result WHERE task_id = #{taskId}
SELECT id, passed, comment, images_url, review_details_id, task_id, user_id, user_name, last_modify_time
, catalogue, review_enterprise_archive_id
FROM t_review_details_result WHERE task_id = #{taskId}
</select>
</select>
<select
id=
"findByTaskIdAndDetailsId"
resultType=
"com.ruoyi.domain.ReviewDetailsResult"
>
<select
id=
"findByTaskIdAndDetailsId"
resultType=
"com.ruoyi.domain.ReviewDetailsResult"
>
SELECT id, passed, comment, images_url, review_details_id, task_id, user_id, user_name, last_modify_time
SELECT id, passed, comment, images_url, review_details_id, task_id, user_id, user_name, last_modify_time
, catalogue, review_enterprise_archive_id
FROM t_review_details_result
FROM t_review_details_result
WHERE task_id = #{taskId} and review_details_id = #{reviewDetailsId}
WHERE task_id = #{taskId} and review_details_id = #{reviewDetailsId}
</select>
</select>
...
...
quality-review/src/main/resources/mapper/ReviewEnterpriseArchiveMapper.xml
View file @
f39a8caa
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
<resultMap
id=
"BaseResultMap"
type=
"com.ruoyi.domain.ReviewEnterpriseArchive"
>
<resultMap
id=
"BaseResultMap"
type=
"com.ruoyi.domain.ReviewEnterpriseArchive"
>
<id
property=
"id"
column=
"id"
jdbcType=
"BIGINT"
/>
<id
property=
"id"
column=
"id"
jdbcType=
"BIGINT"
/>
<result
property=
"enterpriseName"
column=
"enterpri
c
e_name"
jdbcType=
"VARCHAR"
/>
<result
property=
"enterpriseName"
column=
"enterpri
s
e_name"
jdbcType=
"VARCHAR"
/>
<result
property=
"fileName"
column=
"file_name"
jdbcType=
"VARCHAR"
/>
<result
property=
"fileName"
column=
"file_name"
jdbcType=
"VARCHAR"
/>
<result
property=
"version"
column=
"version"
jdbcType=
"VARCHAR"
/>
<result
property=
"version"
column=
"version"
jdbcType=
"VARCHAR"
/>
<result
property=
"publishDate"
column=
"publish_date"
jdbcType=
"DATE"
/>
<result
property=
"publishDate"
column=
"publish_date"
jdbcType=
"DATE"
/>
...
@@ -15,10 +15,12 @@
...
@@ -15,10 +15,12 @@
<result
property=
"storage"
column=
"storage"
jdbcType=
"VARCHAR"
/>
<result
property=
"storage"
column=
"storage"
jdbcType=
"VARCHAR"
/>
<result
property=
"photo"
column=
"photo"
jdbcType=
"VARCHAR"
/>
<result
property=
"photo"
column=
"photo"
jdbcType=
"VARCHAR"
/>
<result
property=
"taskId"
column=
"task_id"
jdbcType=
"BIGINT"
/>
<result
property=
"taskId"
column=
"task_id"
jdbcType=
"BIGINT"
/>
<result
property=
"createBy"
column=
"create_by"
jdbcType=
"VARCHAR"
/>
<result
property=
"createTime"
column=
"create_time"
jdbcType=
"TIMESTAMP"
/>
</resultMap>
</resultMap>
<select
id=
"findByTaskId"
resultType=
"com.ruoyi.domain.ReviewEnterpriseArchive"
>
<select
id=
"findByTaskId"
resultType=
"com.ruoyi.domain.ReviewEnterpriseArchive"
>
SELECT id, enterprise_name, file_name, version, publish_date, status, identify_number, storage, photo, task_id FROM t_review_enterprise_archive WHERE task_id = #{taskId}
SELECT id, enterprise_name, file_name, version, publish_date, status, identify_number, storage, photo, task_id
, create_by, create_time
FROM t_review_enterprise_archive WHERE task_id = #{taskId}
</select>
</select>
<select
id=
"findViewItemVOByTaskId"
resultType=
"com.ruoyi.domain.vo.ReviewEnterpriseArchiveViewItemVO"
>
<select
id=
"findViewItemVOByTaskId"
resultType=
"com.ruoyi.domain.vo.ReviewEnterpriseArchiveViewItemVO"
>
SELECT
SELECT
...
@@ -34,4 +36,33 @@
...
@@ -34,4 +36,33 @@
LEFT JOIN t_review_enterprise_archive archive ON result.review_enterprise_archive_id = archive.id
LEFT JOIN t_review_enterprise_archive archive ON result.review_enterprise_archive_id = archive.id
WHERE result.task_id = #{taskId};
WHERE result.task_id = #{taskId};
</select>
</select>
<select
id=
"findFileName"
resultType=
"java.lang.Long"
>
select COUNT(*) sum from t_review_enterprise_archive
where task_id = #{taskId} and file_name = #{fileName}
</select>
<select
id=
"findEnterpriseArchive"
resultType=
"com.ruoyi.domain.ReviewEnterpriseArchive"
>
SELECT id, enterprise_name, file_name, version, publish_date, status, identify_number, storage, photo, task_id, create_by, create_time
FROM t_review_enterprise_archive
<where>
<if
test=
"fileName != null and fileName != ''"
>
file_name like concat('%',#{fileName},'%')
</if>
<if
test=
"status != null and status != ''"
>
and status = #{status}
</if>
<if
test=
"identifyNumber != null and identifyNumber != ''"
>
and identify_number = #{identifyNumber}
</if>
</where>
</select>
<select
id=
"findByFileName"
resultType=
"com.ruoyi.domain.ReviewEnterpriseArchive"
>
SELECT id, enterprise_name, file_name, version, publish_date, status, identify_number, storage, photo, task_id, create_by, create_time
FROM t_review_enterprise_archive
where file_name = #{fileName}
</select>
<select
id=
"findList"
resultType=
"com.ruoyi.domain.ReviewEnterpriseArchive"
>
SELECT id, enterprise_name, file_name, version, publish_date, status, identify_number, storage, photo, task_id, create_by, create_time
FROM t_review_enterprise_archive
where task_id = #{taskId}
</select>
</mapper>
</mapper>
quality-review/src/main/resources/mapper/TaskMapper.xml
View file @
f39a8caa
...
@@ -153,12 +153,12 @@
...
@@ -153,12 +153,12 @@
<select
id=
"findByCarReviewTaskId"
resultType=
"java.lang.Long"
>
<select
id=
"findByCarReviewTaskId"
resultType=
"java.lang.Long"
>
SELECT id
SELECT id
FROM t_task
FROM t_task
WHERE
system_review_task_id = #{system
ReviewId}
WHERE
car_review_task_id = #{car
ReviewId}
</select>
</select>
<select
id=
"findBySystemReviewTaskId"
resultType=
"java.lang.Long"
>
<select
id=
"findBySystemReviewTaskId"
resultType=
"java.lang.Long"
>
SELECT id
SELECT id
FROM t_task
FROM t_task
WHERE
car_review_task_id = #{car
ReviewId}
WHERE
system_review_task_id = #{system
ReviewId}
</select>
</select>
<select
id=
"findByUserId"
resultMap=
"ResponseMap"
>
<select
id=
"findByUserId"
resultMap=
"ResponseMap"
>
SELECT t.id, t.system_review_task_id, t.car_review_task_id,
SELECT t.id, t.system_review_task_id, t.car_review_task_id,
...
...
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