Skip to content

V
vehicle-quality-review
Commit fcf10238 authored by 盖献康's avatar 盖献康
Browse files
Options

Merge branch 'dev' of... 

Merge branch 'dev' of ssh://gitlab.91isoft.com:10022/wangfei/vehicle-quality-review into gaixiankang
parents e0700fc0 e833fe6e
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 60 deletions
quality-review/src/main/java/com/ruoyi/domain/ReviewEnterpriseArchive.java
View file @ fcf10238
......@@ -46,7 +46,7 @@ public class ReviewEnterpriseArchive implements Serializable {
* 发布日期
*/
@ApiModelProperty("发布日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date publishDate;
/**
......
quality-review/src/main/java/com/ruoyi/domain/Standard.java
View file @ fcf10238
......@@ -54,11 +54,11 @@ public class Standard {
private String standardStatus;
@ApiModelProperty("发布日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date releaseDate;
@ApiModelProperty("实施日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date implementationDate;
}
quality-review/src/main/java/com/ruoyi/domain/vo/SampleTaskVo.java
View file @ fcf10238
package com.ruoyi.domain.vo;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import lombok.AllArgsConstructor;
import lombok.Data;
......@@ -12,7 +15,14 @@ import java.util.List;
@NoArgsConstructor
@Data
public class SampleTaskVo {
@TableId(type = IdType.ASSIGN_ID)
@JsonFormat(shape = JsonFormat.Shape.STRING)
private Long taskId;
@TableId(type = IdType.ASSIGN_ID)
@JsonFormat(shape = JsonFormat.Shape.STRING)
private Long SampleId;
private String taskNo;
}
quality-review/src/main/java/com/ruoyi/mapper/SampleManagementMapper.java
View file @ fcf10238
......@@ -59,6 +59,6 @@ public interface SampleManagementMapper extends BaseMapper<Sample> {
* */
public List<Sample> selectSampleList(SampleManagementRequest sampleManagementRequest);
List<Sample> findByIdList(@Param("relationList") List<TaskSampleRelation> relationList);
List<Sample> findByIdList(@Param("relationList") List<TaskSampleRelation> relationList,@Param("id") Long id);
}
quality-review/src/main/java/com/ruoyi/service/impl/TaskServiceImpl.java
View file @ fcf10238
......@@ -264,30 +264,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
}
taskUserRelationService.saveBatch(auditors);
// 保存关联的整车样品信息
List<TaskSampleRelation> partRelationList = taskSampleRelationService.selectByTaskId(request.getId(),TaskSampleRelation.COMPLETE_VEHICLE_SAMPLE);
taskSampleRelationService.removeBatchByIds(partRelationList);
// 获取传入的样品列表
List<TaskSampleRelation> relations = request.getSample();
if (relations.size() != 0 && relations != null) {
for (TaskSampleRelation sampleRelation : relations) {
sampleRelation.setTaskId(task.getId());
}
taskSampleRelationService.saveBatch(relations);
}
// 保存关联的零部件样品信息
List<TaskSampleRelation> relationList = taskSampleRelationService.selectByTaskId(request.getId(),TaskSampleRelation.PART_VEHICLE_SAMPLE);
taskSampleRelationService.removeBatchByIds(relationList);
List<TaskSampleRelation> partRelations = request.getPartSample();
if (partRelations.size() != 0 && partRelations != null) {
for (TaskSampleRelation partSampleRelation : partRelations) {
partSampleRelation.setTaskId(task.getId());
}
taskSampleRelationService.saveBatch(partRelations);
}
// 任务样品关系
List<TaskSampleRelation> sampleRelations = taskSampleRelationMapper.selectByTaskId(request.getId(),TaskSampleRelation.COMPLETE_VEHICLE_SAMPLE);
......@@ -316,6 +294,30 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
}
}
// 保存关联的整车样品信息
List<TaskSampleRelation> partRelationList = taskSampleRelationService.selectByTaskId(request.getId(),TaskSampleRelation.COMPLETE_VEHICLE_SAMPLE);
taskSampleRelationService.removeBatchByIds(partRelationList);
if (relations.size() != 0 && relations != null) {
for (TaskSampleRelation sampleRelation : relations) {
sampleRelation.setTaskId(task.getId());
}
taskSampleRelationService.saveBatch(relations);
}
// 保存关联的零部件样品信息
List<TaskSampleRelation> relationList = taskSampleRelationService.selectByTaskId(request.getId(),TaskSampleRelation.PART_VEHICLE_SAMPLE);
taskSampleRelationService.removeBatchByIds(relationList);
List<TaskSampleRelation> partRelations = request.getPartSample();
if (partRelations.size() != 0 && partRelations != null) {
for (TaskSampleRelation partSampleRelation : partRelations) {
partSampleRelation.setTaskId(task.getId());
}
taskSampleRelationService.saveBatch(partRelations);
}
}
@Override
......@@ -592,6 +594,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
if (task.getSystemReviewTaskId() != null) {
systemReviewTaskService.view(task.getSystemReviewTaskId());
SystemReviewTask systemReviewTask = systemReviewTaskMapper.selectById(task.getSystemReviewTaskId());
// 获取最新问卷
List<ReviewStandard> standardTree = reviewStandardService.findTree(systemReviewTask.getStandardId(), ReviewStandard.TYPE_SYSTEM);
......@@ -600,13 +604,15 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
List<ReviewDetailsResult> results = reviewDetailsResultService.findByTaskId(systemReviewTask.getId());
// 体系审查
setSystemDataStatistics(standardTree,results,response);
setSystemDataStatistics(standardTree,results,response,systemReviewTask);
return response;
}
if (task.getCarReviewTaskId() != null) {
carReviewTaskService.viewReviewTask(task.getCarReviewTaskId());
CarReviewTask carReviewTask = carReviewTaskMapper.selectById(task.getCarReviewTaskId());
// 获取最新问卷
......@@ -616,7 +622,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
List<ReviewDetailsResult> carResults = reviewDetailsResultService.findByTaskId(carReviewTask.getId());
// 车型审查
setCarDataStatistics(carStandardTree,carResults,response);
setCarDataStatistics(carStandardTree,carResults,response,carReviewTask);
return response;
......@@ -627,16 +633,22 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
}
private void setSystemDataStatistics(List<ReviewStandard> standards, List<ReviewDetailsResult> results,DataStatisticsResponse response) {
private void setSystemDataStatistics(List<ReviewStandard> standards, List<ReviewDetailsResult> results,DataStatisticsResponse response,SystemReviewTask systemReviewTask) {
Map<Long, ReviewDetailsResult> resultMap = results.stream().collect(Collectors.toMap(ReviewDetailsResult::getReviewDetailsId, Function.identity(), (v1, v2) -> v1));
response.setSystemStandards(DataStatisticsUtils.calculateStandards(standards));
if (Objects.equals(systemReviewTask.getTaskStatus(), SystemReviewTask.STATUS_NEW)) {
response.setSystemStandards(DataStatisticsUtils.calculateStandards(standards));
response.setSystemDetails(DataStatisticsUtils.calculateDetails(standards));
} else {
response.setSystemStandards(systemReviewTask.getStandards());
response.setSystemDetails(systemReviewTask.getDetails());
}
response.setSystemStandardsPassNum(DataStatisticsUtils.calculateStandardsPass(standards, resultMap));
response.setSystemStandardsNoPassNum(DataStatisticsUtils.calculateStandardsNoPass(standards, resultMap));
response.setSystemStandardsUnderNum(response.getSystemStandards() -response.getSystemStandardsPassNum() - response.getSystemStandardsNoPassNum());
BigDecimal standardPass = new BigDecimal((response.getSystemStandardsPassNum() / (double) response.getSystemStandards())*100);
response.setSystemStandardsPass(standardPass.setScale(1,BigDecimal.ROUND_UP).doubleValue());
response.setSystemDetails(DataStatisticsUtils.calculateDetails(standards));
response.setSystemDetailsPassNum(DataStatisticsUtils.calculateDetailsPass(standards, resultMap));
response.setSystemDetailsNoPassNum(DataStatisticsUtils.calculateDetailsNoPass(standards, resultMap));
response.setSystemDetailsUnderNum(response.getSystemDetails() - response.getSystemDetailsPassNum() - response.getSystemDetailsNoPassNum());
......@@ -645,16 +657,21 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
}
private void setCarDataStatistics(List<ReviewStandard> standards, List<ReviewDetailsResult> results,DataStatisticsResponse response) {
private void setCarDataStatistics(List<ReviewStandard> standards, List<ReviewDetailsResult> results,DataStatisticsResponse response,CarReviewTask carReviewTask) {
Map<Long, ReviewDetailsResult> resultMap = results.stream().collect(Collectors.toMap(ReviewDetailsResult::getReviewDetailsId, Function.identity(), (v1, v2) -> v1));
response.setCarStandards(DataStatisticsUtils.calculateStandards(standards));
if (Objects.equals(carReviewTask.getTaskStatus(), CarReviewTask.TASK_STATUS_NEW)) {
response.setCarStandards(DataStatisticsUtils.calculateStandards(standards));
response.setCarDetails(DataStatisticsUtils.calculateDetails(standards));
} else {
response.setCarStandards(carReviewTask.getStandards());
response.setCarDetails(carReviewTask.getDetails());
}
response.setCarStandardsPassNum(DataStatisticsUtils.calculateStandardsPass(standards, resultMap));
response.setCarStandardsNoPassNum(DataStatisticsUtils.calculateStandardsNoPass(standards, resultMap));
response.setCarStandardsUnderNum(response.getCarStandards() -response.getCarStandardsPassNum() - response.getCarStandardsNoPassNum());
BigDecimal standardPass = new BigDecimal((response.getCarStandardsPassNum() / (double) response.getCarStandards())*100);
response.setCarStandardsPass(standardPass.setScale(1,BigDecimal.ROUND_UP).doubleValue());
response.setCarDetails(DataStatisticsUtils.calculateDetails(standards));
response.setCarDetailsPassNum(DataStatisticsUtils.calculateDetailsPass(standards, resultMap));
response.setCarDetailsNoPassNum(DataStatisticsUtils.calculateDetailsNoPass(standards, resultMap));
response.setCarDetailsUnderNum(response.getCarDetails() - response.getCarDetailsPassNum() - response.getCarDetailsNoPassNum());
......@@ -675,7 +692,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
// 样品信息
List<TaskSampleRelation> relationList = taskSampleRelationService.selectByTaskId(id,type);
if (relationList.size() != 0 && relationList != null) {
List<Sample> SampleList = sampleManagementMapper.findByIdList(relationList);
List<Sample> SampleList = sampleManagementMapper.findByIdList(relationList,id);
return SampleList;
} else {
return null;
......
quality-review/src/main/resources/mapper/SampleManagementMapper.xml
View file @ fcf10238
......@@ -172,11 +172,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="sampleName" column="sample_name" />
<result property="enterpriseId" column="enterprise_id" />
</resultMap>
<select id="findByIdList" resultMap="SampleListResponse">
select id,identification_code,sample_number,sample_name,enterprise_id from t_sample
WHERE id IN
<select id="findByIdList" resultMap="SampleManagementResult">
select t.id,t.identification_code,t.sample_number,t.sample_name,t.enterprise_id,t.trademark,t.sample_photos,t.number_of_samples,t.delivery_date,t.sample_sender,t.manufacturing_enterprise,t.manufacture_date
from t_sample t
left join t_task_sample_relation ts on ts.sample_id = t.id and ts.task_id = #{id}
WHERE t.id IN
<foreach collection="relationList" item="relation" open="(" separator="," close=")">
#{relation.sampleId}
</foreach>
ORDER BY ts.id
</select>
</mapper>
\ No newline at end of file
quality-review/src/main/resources/mapper/TaskMapper.xml
View file @ fcf10238
......@@ -116,11 +116,7 @@
and t.product_model like concat('%',#{request.productModel},'%')
</if>
<if test="request.inspectionItem != null and request.inspectionItem != ''">
AND(
(#{request.inspectionItem} = 'sraif' AND t.system_review_task_id IS NOT NULL)
OR
(#{request.inspectionItem} = 'grfis' AND t.car_review_task_id IS NOT NULL)
)
and t.task_list like concat('%',#{request.inspectionItem},'%')
</if>
</where>
order by t.create_time desc
......@@ -149,11 +145,7 @@
and t.product_model like concat('%',#{productModel},'%')
</if>
<if test="inspectionItem != null and inspectionItem != ''">
AND (
(#{inspectionItem} = 'sraif' AND t.system_review_task_id IS NOT NULL)
OR
(#{inspectionItem} = 'grfis' AND t.car_review_task_id IS NOT NULL)
)
and t.task_list like concat('%',#{inspectionItem},'%')
</if>
</where>
order by t.task_begin_time desc
......@@ -201,11 +193,7 @@
and t.product_model like concat('%',#{request.productModel},'%')
</if>
<if test="request.inspectionItem != null and request.inspectionItem != ''">
AND (
(#{request.inspectionItem} = 'sraif' AND t.system_review_task_id IS NOT NULL)
OR
(#{request.inspectionItem} = 'grfis' AND t.car_review_task_id IS NOT NULL)
)
and t.task_list like concat('%',#{request.inspectionItem},'%')
</if>
<if test="request.taskStatus != null and request.taskStatus != ''">
and t.task_status = #{request.taskStatus}
......@@ -228,7 +216,7 @@
)
and t.task_status = 'FINISH'
<if test="request.standardId != null and request.standardId != ''">
and t.standard_id = #{standardId}
and t.standard_id = #{request.standardId}
</if>
<if test="request.taskNo != null and request.taskNo != ''">
and t.task_no like concat('%',#{request.taskNo},'%')
......@@ -240,11 +228,7 @@
and t.product_model like concat('%',#{request.productModel},'%')
</if>
<if test="request.inspectionItem != null and request.inspectionItem != ''">
AND (
(#{request.inspectionItem} = 'sraif' AND t.system_review_task_id IS NOT NULL)
OR
(#{request.inspectionItem} = 'grfis' AND t.car_review_task_id IS NOT NULL)
)
and t.task_list like concat('%',#{request.inspectionItem},'%')
</if>
</where>
order by t.task_begin_time desc
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment