Compare commits

..

No commits in common. "fadadde6f1e7abbc6185eb83a0fbf685581657a0" and "ccd5cf3debc163a25641ce571c333264e316d804" have entirely different histories.

4 changed files with 12 additions and 29 deletions

View File

@ -55,8 +55,9 @@ public class TaskSetUpController extends BaseController {
}
//指标配置
@GetMapping("/target/{id}")
@PostMapping("/target")
public AjaxResult getTarget(@PathVariable Integer id){
return AjaxResult.success(taskService.getTarget(id));
taskService.getTarget(id);
return AjaxResult.success();
}
}

View File

@ -1,6 +1,5 @@
package tech.unissense.pms.business.examine.task.service;
import tech.unissense.pms.business.examine.config.domain.ExamineConfig;
import tech.unissense.pms.business.examine.task.domain.ExamineTask;
import tech.unissense.pms.business.examine.task.domain.TaskQueryDto;
@ -15,5 +14,5 @@ public interface TaskService {
void deleteTask(Integer id);
List<ExamineConfig> getTarget(Integer id);
void getTarget(Integer id);
}

View File

@ -3,9 +3,6 @@ package tech.unissense.pms.business.examine.task.service.impl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import tech.unissense.pms.business.examine.config.domain.ExamineConfig;
import tech.unissense.pms.business.examine.config.mapper.ExamineConfigMapper;
import tech.unissense.pms.business.examine.config.service.ExamineConfigService;
import tech.unissense.pms.business.examine.task.domain.ExamineTask;
import tech.unissense.pms.business.examine.task.domain.TaskQueryDto;
import tech.unissense.pms.business.examine.task.mapper.ExamineTaskMapper;
@ -21,20 +18,9 @@ public class TaskServiceImpl implements TaskService {
@Autowired
private ExamineTaskMapper examineTaskDao;
@Autowired
private ExamineConfigMapper examineConfigMapper;
@Override
public ExamineTask addTask(ExamineTask task) {
examineTaskDao.addTask(task);
ExamineConfig examineConfig = new ExamineConfig();
examineConfig.setExamineTaskId(-1);
List<ExamineConfig> list = examineConfigMapper.list(examineConfig);
list.forEach(item -> {
item.setExamineTaskId(task.getId());
});
examineConfigMapper.insertBatch(list);
return task;
}
@ -55,9 +41,7 @@ public class TaskServiceImpl implements TaskService {
}
@Override
public List<ExamineConfig> getTarget(Integer id) {
ExamineConfig examineConfig = new ExamineConfig();
examineConfig.setExamineTaskId(id);
return examineConfigMapper.list(examineConfig);
public void getTarget(Integer id) {
}
}

View File

@ -116,25 +116,25 @@
<!--新增所有列-->
<insert id="insert" keyProperty="id" useGeneratedKeys="true">
insert into pms_examine_config(review_type, review_category, review_item, remarks, weight, examine_task_id, sort_num)
values (#{reviewType}, #{reviewCategory}, #{reviewItem}, #{remarks}, #{weight}, #{examineTaskId}, #{sortNum})
insert into pms_examine_config(review_type, review_category, review_item, remarks, weight, examine_task_id)
values (#{reviewType}, #{reviewCategory}, #{reviewItem}, #{remarks}, #{weight}, #{examineTaskId})
</insert>
<insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
insert into pms_examine_config(review_type, review_category, review_item, remarks, weight, examine_task_id, sort_num)
insert into pms_examine_config(review_type, review_category, review_item, remarks, weight, examine_task_id)
values
<foreach collection="entities" item="entity" separator=",">
(#{entity.reviewType}, #{entity.reviewCategory}, #{entity.reviewItem}, #{entity.remarks}, #{entity.weight},
#{entity.examineTaskId}, #{entity.sortNum})
#{entity.examineTaskId})
</foreach>
</insert>
<insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
insert into pms_examine_config(review_type, review_category, review_item, remarks, weight, examine_task_id, sort_num)
insert into pms_examine_config(review_type, review_category, review_item, remarks, weight, examine_task_id)
values
<foreach collection="entities" item="entity" separator=",">
(#{entity.reviewType}, #{entity.reviewCategory}, #{entity.reviewItem}, #{entity.remarks}, #{entity.weight},
#{entity.examineTaskId}, #{entity.sortNum})
#{entity.examineTaskId})
</foreach>
on duplicate key update
review_type = values(review_type),
@ -143,7 +143,6 @@
remarks = values(remarks),
weight = values(weight),
examine_task_id = values(examine_task_id)
sort_num = values(sort_num)
</insert>
<!--通过主键修改数据-->