Skip to content

V
vehicle-quality-review
Commit c71f150f authored by wdy's avatar wdy
Browse files
Options

创建任务

parent 59df62d7
Hide whitespace changes
Inline Side-by-side
Showing with 142 additions and 118 deletions
quality-review/src/main/java/com/ruoyi/domain/Task.java
View file @ c71f150f
......@@ -30,12 +30,21 @@ public class Task {
@TableField(exist = false)
public static final String STATUS_FINISH = "FINISH";
/**
* 汽车信息安全一般要求
*/
@TableField(exist = false)
public static final String SUB_TASK_GRFIS = "grfis";
/**
* 汽车信息安全技术要求
*/
@TableField(exist = false)
public static final String SUB_TASK_TRFIS = "trfis";
/**
* 汽车信息安全管理体系要求
*/
@TableField(exist = false)
public static final String SUB_TASK_SRAIF = "sraif";
......@@ -52,22 +61,25 @@ public class Task {
@JsonFormat(shape = JsonFormat.Shape.STRING)
private Long carReviewTaskId;
@ApiModelProperty("任务状态（NEW、FINISH）")
private String taskStatus;
@ApiModelProperty("下一个节点 SUB_TASK_SRAIF（体系审查子任务）、SUB_TASK_TRFIS（车辆实验子任务）、SUB_TASK_GRFIS（车辆问卷子任务）")
private String nextNode;
@ApiModelProperty("任务编号")
private String taskNo;
@ApiModelProperty("任务名称")
private String taskName;
@ApiModelProperty("任务状态（NEW、FINISH）")
private String taskStatus;
@ApiModelProperty("下一个节点 SUB_TASK_SRAIF（体系审查子任务）、SUB_TASK_TRFIS（车辆实验子任务）、SUB_TASK_GRFIS（车辆问卷子任务）")
private String nextNode;
@ApiModelProperty("保密等级")
private String confidentialityLevel;
@ApiModelProperty("产品名称")
private String productName;
@ApiModelProperty("产品型号")
@ApiModelProperty(" 车辆型号（产品型号）")
private String productModel;
@ApiModelProperty("委托单位")
......@@ -82,42 +94,14 @@ public class Task {
@ApiModelProperty("委托单位邮政编码")
private String entrustedUnitCode;
@ApiModelProperty("车辆类型")
private String carType;
@ApiModelProperty("车辆识别码")
private String carIdentificationCode;
@ApiModelProperty("保密等级")
private String confidentialityLevel;
@ApiModelProperty("样品名称")
private String sampleName;
@ApiModelProperty("生产企业id")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private Long productionId;
@ApiModelProperty("生产企业")
private String productionEnterprise;
@ApiModelProperty("送样者")
private String sampleSender;
@ApiModelProperty("送样日期")
private Date sendDate;
@ApiModelProperty("样品数量")
private String sampleNumber;
@ApiModelProperty("生产日期")
private Date productionDate;
@ApiModelProperty("整车样品信息id")
private String vehicleSampleInformation;
@ApiModelProperty("商标")
private String trademark;
@ApiModelProperty("零件样品信息id")
private String partSampleInformation;
@ApiModelProperty("检验依据")
private String inspectionBasis;
@ApiModelProperty("任务发起人id")
private Long taskInitiatorId;
@ApiModelProperty("任务发起人姓名")
private String taskInitiator;
......@@ -146,7 +130,7 @@ public class Task {
@JsonFormat(shape = JsonFormat.Shape.STRING)
@ApiModelProperty("关联标准表id")
@ApiModelProperty("关联标准表id（检验依据）")
private Long standardId;
......
quality-review/src/main/java/com/ruoyi/mapper/TaskMapper.java
View file @ c71f150f
......@@ -4,8 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.domain.Task;
import com.ruoyi.web.request.TaskFindFinishRequest;
import com.ruoyi.web.request.TaskFindPendingRequest;
import com.ruoyi.web.request.TaskFindRequest;
import com.ruoyi.web.request.TaskListRequest;
import com.ruoyi.web.response.TaskFindPendingResponse;
import com.ruoyi.web.response.TaskFindResponse;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
......@@ -16,10 +17,12 @@ public interface TaskMapper extends BaseMapper<Task> {
List<Task> findList(TaskListRequest request);
List<TaskFindPendingResponse> findPending(TaskFindPendingRequest request);
List<TaskFindResponse> findPending(TaskFindPendingRequest request);
List<Task> findFinish(TaskFindFinishRequest request);
List<TaskFindResponse> findByUserId(@Param("request") TaskFindRequest request,@Param("userId")Long userId);
Long findByCarReviewTaskId(@Param("carReviewId") Long carReviewId);
Long findBySystemReviewTaskId(@Param("systemReviewId") Long systemReviewId);
......
quality-review/src/main/java/com/ruoyi/service/TaskService.java
View file @ c71f150f
......@@ -3,8 +3,7 @@ package com.ruoyi.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.domain.Task;
import com.ruoyi.web.request.*;
import com.ruoyi.web.response.TaskFindPendingResponse;
import org.apache.ibatis.annotations.Param;
import com.ruoyi.web.response.TaskFindResponse;
import java.util.List;
......@@ -24,7 +23,7 @@ public interface TaskService extends IService<Task> {
* @param request
* @return
*/
List<TaskFindPendingResponse> findPending(TaskFindPendingRequest request);
List<TaskFindResponse> findPending(TaskFindPendingRequest request);
/**
* 查询完成的任务
......
quality-review/src/main/java/com/ruoyi/service/impl/TaskServiceImpl.java
View file @ c71f150f
package com.ruoyi.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.SnowflakeUtil;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.domain.*;
import com.ruoyi.mapper.*;
import com.ruoyi.service.*;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.web.request.*;
import com.ruoyi.web.response.TaskFindPendingResponse;
import org.checkerframework.checker.units.qual.A;
import com.ruoyi.web.response.TaskFindResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......@@ -85,6 +82,9 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
// 构建并保存任务信息
// 总任务
Task task = new Task();
task.setVehicleSampleInformation(String.join(",",request.getVehicleSampleInformation()));
task.setPartSampleInformation(String.join(",",request.getPartSampleInformation()));
task.setTaskInitiatorId(loginUser.getUserId());
task.setTaskInitiator(initiator.getNickName());
task.setTaskInitiatorDept(initiator.getDept().getDeptName());
task.setTaskStatus(Task.STATUS_RUNNABLE);
......@@ -95,8 +95,6 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
task.setStandardNo(standard.getStandardNo());
task.setFile(standard.getFile());
BeanUtils.copyBeanProp(task, request);
AutomobileEnterprise automobileEnterprise = automobileEnterpriseMapper.selectAutomobileEnterpriseById(request.getProductionId());
task.setProductionEnterprise(automobileEnterprise.getEnterpriseName());
String nextNode = null;
......@@ -128,9 +126,9 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
}
@Override
public List<TaskFindPendingResponse> findPending(TaskFindPendingRequest request) {
List<TaskFindPendingResponse> responses = taskMapper.findPending(request);
for (TaskFindPendingResponse response : responses) {
public List<TaskFindResponse> findPending(TaskFindPendingRequest request) {
List<TaskFindResponse> responses = taskMapper.findPending(request);
for (TaskFindResponse response : responses) {
if (response.getSystemReviewTaskId() != null) {
response.setSystemReview(reviewDetailsMapper.count(response.getSystemReviewTaskId(),SystemReviewTask.TYPE));
}
......
quality-review/src/main/java/com/ruoyi/web/TaskController.java
View file @ c71f150f
......@@ -11,7 +11,7 @@ import com.ruoyi.domain.TaskUserRelation;
import com.ruoyi.service.TaskService;
import com.ruoyi.service.TaskUserRelationService;
import com.ruoyi.web.request.*;
import com.ruoyi.web.response.TaskFindPendingResponse;
import com.ruoyi.web.response.TaskFindResponse;
import com.ruoyi.web.response.TaskGetInfoResponse;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -75,7 +75,7 @@ public class TaskController extends BaseController {
@Trace
@Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
@RequestMapping(method = RequestMethod.POST, value = "/findPending")
public TableDataInfo<TaskFindPendingResponse> findPending(@Validated @RequestBody TaskFindPendingRequest request) {
public TableDataInfo<TaskFindResponse> findPending(@Validated @RequestBody TaskFindPendingRequest request) {
startPage(request);
return getDataTable(taskService.findPending(request));
}
......
quality-review/src/main/java/com/ruoyi/web/request/TaskCreateRequest.java
View file @ c71f150f
......@@ -18,16 +18,26 @@ public class TaskCreateRequest {
@ApiModelProperty("小组成员")
private List<TaskUserRelation> auditors;
/**
* 标准id
* 根据哪个标准新建的审查任务
*/
@ApiModelProperty("标准id(检验依据)")
private Long standardId;
@ApiModelProperty("任务编号")
private String taskNo;
@ApiModelProperty("任务名称")
private String taskName;
@ApiModelProperty("保密等级")
private String confidentialityLevel;
@ApiModelProperty("产品名称")
private String productName;
@ApiModelProperty("产品型号")
@ApiModelProperty("车辆型号（产品型号）")
private String productModel;
@ApiModelProperty("委托单位")
......@@ -42,46 +52,14 @@ public class TaskCreateRequest {
@ApiModelProperty("委托单位邮政编码")
private String entrustedUnitCode;
@ApiModelProperty("车辆类型")
private String carType;
@ApiModelProperty("车辆识别码")
private String carIdentificationCode;
@ApiModelProperty("保密等级")
private String confidentialityLevel;
@ApiModelProperty("样品名称")
private String sampleName;
@ApiModelProperty("生产企业id")
private Long productionId;
@ApiModelProperty("送样者")
private String sampleSender;
@ApiModelProperty("送样日期")
private Date sendDate;
@ApiModelProperty("样品数量")
private String sampleNumber;
@ApiModelProperty("生产日期")
private Date productionDate;
@ApiModelProperty("商标")
private String trademark;
@ApiModelProperty("整车样品信息id")
private List<String> vehicleSampleInformation;
@ApiModelProperty("检验依据")
private String inspectionBasis;
@ApiModelProperty("零件样品信息id")
private List<String> partSampleInformation;
@ApiModelProperty("选择的任务")
List<String> taskList;
/**
* 标准id
* 根据哪个标准新建的审查任务
*/
@ApiModelProperty("标准id(根据哪个标准新建的任务)")
private Long standardId;
}
quality-review/src/main/java/com/ruoyi/web/request/TaskFindRequest.java 0 → 100644
View file @ c71f150f
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;
import java.util.Date;
@ApiModel(value = "TaskFindRequest", description = "用户创建的任务")
@Data
public class TaskFindRequest extends PageDomain {
@ApiModelProperty("检验依据")
private Long standardId;
@ApiModelProperty("任务编号")
private String taskNo;
@ApiModelProperty("任务名称")
private String taskName;
@ApiModelProperty("车辆型号")
private String productModel;
@ApiModelProperty("检验项目")
private String inspectionItem;
@ApiModelProperty("任务状态")
private String taskStatus;
}
quality-review/src/main/java/com/ruoyi/web/response/TaskFindPendingResponse.java → quality-review/src/main/java/com/ruoyi/web/response/TaskFindResponse.java
View file @ c71f150f
......@@ -9,7 +9,7 @@ import java.util.Date;
@ApiModel(value = "TaskFindPendingResponse", description = "进行中的总任务")
@Data
public class TaskFindPendingResponse {
public class TaskFindResponse {
@ApiModelProperty("主键")
@JsonFormat(shape = JsonFormat.Shape.STRING)
......@@ -29,6 +29,9 @@ public class TaskFindPendingResponse {
@ApiModelProperty("任务名称")
private String taskName;
@ApiModelProperty("车辆型号（产品型号）")
private String productModel;
@ApiModelProperty("任务状态（NEW、PENDING、FINISH）")
private String taskStatus;
......@@ -54,7 +57,7 @@ public class TaskFindPendingResponse {
@ApiModelProperty("体系问卷任务开始时间")
private Date systemTaskBeginTime;
@ApiModelProperty("体系问卷任务开始时间")
@ApiModelProperty("体系问卷任务结束时间")
private Date systemTaskEndTime;
@ApiModelProperty("车型审查任务状态")
......@@ -66,7 +69,7 @@ public class TaskFindPendingResponse {
@ApiModelProperty("车辆问卷任务开始时间")
private Date carTaskBeginTime;
@ApiModelProperty("车辆问卷任务开始时间")
@ApiModelProperty("车辆问卷任务结束时间")
private Date carTaskEndTime;
@ApiModelProperty("测试任务状态")
......
quality-review/src/main/resources/mapper/TaskMapper.xml
View file @ c71f150f
......@@ -8,28 +8,20 @@
<id property="id" column="id" jdbcType="BIGINT"/>
<id property="systemReviewTaskId" column="system_review_task_id" jdbcType="BIGINT"/>
<id property="carReviewTaskId" column="car_review_task_id" jdbcType="BIGINT"/>
<result property="taskNo" column="task_no" jdbcType="VARCHAR"/>
<result property="taskName" column="task_name" jdbcType="VARCHAR"/>
<result property="taskStatus" column="task_status" jdbcType="VARCHAR"/>
<result property="nextNode" column="next_node" jdbcType="VARCHAR"/>
<result property="taskNo" column="task_no" jdbcType="VARCHAR"/>
<result property="taskName" column="task_name" jdbcType="VARCHAR"/>
<result property="confidentialityLevel" column="confidentiality_level" jdbcType="VARCHAR"/>
<result property="productName" column="product_name" jdbcType="VARCHAR"/>
<result property="productModel" column="product_model" jdbcType="VARCHAR"/>
<result property="entrustedUnit" column="entrusted_unit" jdbcType="VARCHAR"/>
<result property="entrustedUnitAddress" column="entrusted_unit_address" jdbcType="VARCHAR"/>
<result property="entrustedUnitPhone" column="entrusted_unit_phone" jdbcType="VARCHAR"/>
<result property="entrustedUnitCode" column="entrusted_unit_code" jdbcType="VARCHAR"/>
<result property="carType" column="car_type" jdbcType="VARCHAR"/>
<result property="carIdentificationCode" column="car_identification_code" jdbcType="VARCHAR"/>
<result property="confidentialityLevel" column="confidentiality_level" jdbcType="VARCHAR"/>
<result property="sampleName" column="sample_name" jdbcType="VARCHAR"/>
<result property="productionId" column="production_id" jdbcType="BIGINT"/>
<result property="productionEnterprise" column="production_enterprise" jdbcType="VARCHAR"/>
<result property="sampleSender" column="sample_sender" jdbcType="VARCHAR"/>
<result property="sendDate" column="send_date" jdbcType="TIMESTAMP"/>
<result property="sampleNumber" column="sample_number" jdbcType="VARCHAR"/>
<result property="productionDate" column="production_date" jdbcType="TIMESTAMP"/>
<result property="trademark" column="trademark" jdbcType="VARCHAR"/>
<result property="inspectionBasis" column="inspection_basis" jdbcType="VARCHAR"/>
<result property="vehicleSampleInformation" column="vehicle_sample_information" jdbcType="VARCHAR"/>
<result property="partSampleInformation" column="part_sample_information" jdbcType="VARCHAR"/>
<result property="taskInitiatorId" column="task_initiator_id" jdbcType="BIGINT"/>
<result property="taskInitiator" column="task_initiator" jdbcType="VARCHAR"/>
<result property="taskInitiatorDept" column="task_initiator_dept" jdbcType="VARCHAR"/>
<result property="taskBeginTime" column="task_begin_time" jdbcType="TIMESTAMP"/>
......@@ -43,7 +35,7 @@
<result property="file" column="file" jdbcType="VARCHAR"/>
</resultMap>
<resultMap id="ResponseMap" type="com.ruoyi.web.response.TaskFindPendingResponse">
<resultMap id="ResponseMap" type="com.ruoyi.web.response.TaskFindResponse">
<id property="id" column="id" jdbcType="BIGINT"/>
<id property="systemReviewTaskId" column="system_review_task_id" jdbcType="BIGINT"/>
<id property="carReviewTaskId" column="car_review_task_id" jdbcType="BIGINT"/>
......@@ -64,12 +56,11 @@
<select id="findList" parameterType="com.ruoyi.web.request.TaskListRequest" resultMap="BaseResultMap">
SELECT id, system_review_task_id, car_review_task_id,
task_no,task_name,task_status,next_node,product_name,product_model,
task_status,next_node,task_no,task_name,confidentiality_level,
product_name,product_model,
entrusted_unit,entrusted_unit_address,entrusted_unit_phone,
entrusted_unit_code,car_type,car_identification_code,
confidentiality_level,sample_name,production_id,production_enterprise,
sample_sender,send_date,sample_number,production_date,
trademark,inspection_basis,task_initiator,task_initiator_dept,
entrusted_unit_code,vehicle_sample_information,part_sample_information,
task_initiator_id,task_initiator,task_initiator_dept,
task_begin_time,task_end_time,create_time,
leader_id,leader,standard_id,name,
standard_no,file
......@@ -141,6 +132,43 @@
FROM t_task
WHERE car_review_task_id = #{carReviewId}
</select>
<select id="findByUserId" resultMap="ResponseMap">
SELECT t.id, t.system_review_task_id, t.car_review_task_id,
t.task_no,t.task_name,t.task_status,
t.leader_id,t.leader,
t.task_begin_time,
t.next_node,
srt.task_begin_time system_task_begin_time,
srt.task_end_time system_task_end_time,
srt.task_status review_status,
crt.task_begin_time car_task_begin_time,
crt.task_end_time car_task_end_time,
crt.task_status car_review_status
FROM t_task t
left join t_system_review_task srt on t.system_review_task_id = srt.id
left join t_car_review_task crt on t.car_review_task_id = crt.id
<where>
<if test="request.standardId != null and request.standardId != ''">
and t.standard_id = #{request.standardId}
</if>
<if test="request.taskNo != null and request.taskNo != ''">
and t.task_no = #{request.taskNo}
</if>
<if test="request.taskName != null and request.taskName != ''">
and t.task_name like concat('%',#{request.taskName},'%')
</if>
<if test="request.productModel != null and request.productModel != ''">
and t.product_model = #{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)
)
</if>
</where>
</select>
</mapper>
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