From 442a635882a5973c9f3401a30bcfa0a43434fa74 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 17 七月 2024 16:34:51 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskPhaseService.java | 3 +
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/TaskPhaseDao.java | 1
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhase.java | 3 +
web/src/views/modules/taskReliability/TaskBinoParam.vue | 6 +-
web/src/views/modules/taskReliability/TaskPhase.vue | 4 +-
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/TaskPhaseController.java | 22 ++++++-----
web/src/views/modules/taskReliability/Task.vue | 6 +-
modules/mainPart/src/main/resources/mapper/taskReliability/TaskPhaseDao.xml | 18 ++++----
8 files changed, 35 insertions(+), 28 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/TaskPhaseController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/TaskPhaseController.java
index f86ab94..0c4e26a 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/TaskPhaseController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/TaskPhaseController.java
@@ -27,12 +27,12 @@
/**
* task_phase
*
- * @author zt generator
+ * @author zt generator
* @since 1.0.0 2024-03-15
*/
@RestController
@RequestMapping("/taskReliability/TaskPhase/")
-@Api(tags="task_phase")
+@Api(tags = "task_phase")
public class TaskPhaseController {
@Autowired
private TaskPhaseService taskPhaseService;
@@ -40,18 +40,18 @@
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@ApiImplicitParams({
- @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
- @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
- @ApiImplicitParam(name = "taskId", value = "浠诲姟ID", dataType = Constant.QT.STRING),
+ @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
+ @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
+ @ApiImplicitParam(name = "taskId", value = "浠诲姟ID", dataType = Constant.QT.STRING),
})
- public Result<List<TaskPhase>> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
+ public Result<List<TaskPhase>> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {
return Result.ok(taskPhaseService.page(queryFilter));
}
@GetMapping("{id}")
@ApiOperation("淇℃伅")
- public Result<TaskPhase> get(@PathVariable("id") Long id){
+ public Result<TaskPhase> get(@PathVariable("id") Long id) {
TaskPhase data = taskPhaseService.get(id);
return Result.ok(data);
@@ -60,9 +60,11 @@
@PostMapping
@ApiOperation("鏂板")
@LogOperation("鏂板")
- public Result insert(@RequestBody TaskPhase taskPhase){
+ public Result insert(@RequestBody TaskPhase taskPhase) {
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(taskPhase, AddGroup.class, DefaultGroup.class);
+ Integer no = taskPhaseService.getMaxSort(taskPhase.getTaskId());
+ taskPhase.setPhaseSort(no + 1);
taskPhaseService.insert(taskPhase);
return Result.ok();
@@ -71,7 +73,7 @@
@PutMapping
@ApiOperation("淇敼")
@LogOperation("淇敼")
- public Result update(@RequestBody TaskPhase taskPhase){
+ public Result update(@RequestBody TaskPhase taskPhase) {
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(taskPhase, UpdateGroup.class, DefaultGroup.class);
taskPhaseService.update(taskPhase);
@@ -82,7 +84,7 @@
@DeleteMapping
@ApiOperation("鍒犻櫎")
@LogOperation("鍒犻櫎")
- public Result delete(@RequestBody Long[] ids){
+ public Result delete(@RequestBody Long[] ids) {
//鏁堥獙鏁版嵁
AssertUtils.isArrayEmpty(ids, "id");
taskPhaseService.delete(ids);
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/TaskPhaseDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/TaskPhaseDao.java
index a7bba5c..7872049 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/TaskPhaseDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/TaskPhaseDao.java
@@ -20,4 +20,5 @@
List<TaskPhase> getList(Map<String, Object> params);
+ Integer getMaxSort(Long taskId);
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhase.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhase.java
index e16bd9f..f9246d5 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhase.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/TaskPhase.java
@@ -32,9 +32,10 @@
@ApiModelProperty(value = "闃舵鏃堕��")
private Double phaseSpeed;
+ */
+
@ApiModelProperty(value = "闃舵椤哄簭")
private Integer phaseSort;
-*/
@ApiModelProperty(value = "澶囨敞")
private String remark;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskPhaseService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskPhaseService.java
index 08d899c..07403bd 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskPhaseService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskPhaseService.java
@@ -37,4 +37,7 @@
super.deleteLogic(ids);
}
+ public Integer getMaxSort(Long taskId) {
+ return baseDao.getMaxSort(taskId);
+ }
}
diff --git a/modules/mainPart/src/main/resources/mapper/taskReliability/TaskPhaseDao.xml b/modules/mainPart/src/main/resources/mapper/taskReliability/TaskPhaseDao.xml
index 7103f5b..a4e8995 100644
--- a/modules/mainPart/src/main/resources/mapper/taskReliability/TaskPhaseDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/taskReliability/TaskPhaseDao.xml
@@ -11,16 +11,16 @@
task_phase a
LEFT JOIN (select phase_id , SUM(operat_condit_duration_rate) as operatConditDuration from task_phase_model
where is_delete =0 group by phase_id) b ON a.id = b.phase_id
- <where>
- a.is_delete = 0
+ where a.is_delete = 0
and a.task_id=${taskId}
- <if test="whereSql!=null">
- and ${whereSql}
- </if>
- </where>
- <if test="orderBySql!=null">
- ORDER BY ${orderBySql}
- </if>
+ ORDER BY a.phase_sort
+ </select>
+ <select id="getMaxSort" resultType="java.lang.Integer">
+ SELECT COUNT(*)
+ FROM task_phase
+ where
+ is_delete = 0
+ and task_id =${taskId}
</select>
</mapper>
diff --git a/web/src/views/modules/taskReliability/Task.vue b/web/src/views/modules/taskReliability/Task.vue
index c539733..c915140 100644
--- a/web/src/views/modules/taskReliability/Task.vue
+++ b/web/src/views/modules/taskReliability/Task.vue
@@ -19,14 +19,14 @@
@row-click="selectTask"
@selection-change="table.selectionChangeHandle">
<el-table-column type="selection" width="40" align="center"/>
- <el-table-column prop="taskName" label="浠诲姟鍚嶇О" align="center" width="120"/>
+ <el-table-column prop="taskName" label="浠诲姟鍚嶇О" align="center" width="140"/>
<!--<el-table-column prop="taskSort" label="浠诲姟椤哄簭" align="center"/>-->
<el-table-column prop="taskDuration" label="浠诲姟鎬绘椂闀�" align="right" width="120"/>
- <el-table-column prop="taskStaus" label="鐘舵��" align="center" width="75">
+ <el-table-column prop="taskStaus" label="鐘舵��" align="center" >
</el-table-column>
<zt-table-column-handle :table="table"
- delete-perm="taskReliability::delete"/>
+ delete-perm="taskReliability::delete" width="100"/>
</el-table>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
<add-or-update @refreshDataList="table.query" ref="AddOrUpdate"/>
diff --git a/web/src/views/modules/taskReliability/TaskBinoParam.vue b/web/src/views/modules/taskReliability/TaskBinoParam.vue
index 72db6a0..bdb7316 100644
--- a/web/src/views/modules/taskReliability/TaskBinoParam.vue
+++ b/web/src/views/modules/taskReliability/TaskBinoParam.vue
@@ -17,13 +17,13 @@
<el-table-column prop="phaseName" label="闃舵" align="center" />
<el-table-column prop="operatConditName" label="宸ュ喌" align="center"/>
<el-table-column prop="productName" label="浜岄」鍒嗗竷璁惧" align="center"/>
- <el-table-column prop="successRate" label="鎴愬姛鐜�" align="right" width="100">
- <template slot-scope="scope">
+ <el-table-column prop="successRate" label="鎴愬姛鐜�" width="100">
+ <template slot-scope="scope" >
<span
v-if="editingCell && editingCell.row === scope.row && editingCell.column.property === scope.column.property">
<el-input ref="editInput"
autosize v-model="scope.row.successRate"
- placeholder="鎴愬姛鐜�"></el-input>
+ placeholder="鎴愬姛鐜�" ></el-input>
</span>
<span v-else>{{scope.row.successRate}}</span>
</template>
diff --git a/web/src/views/modules/taskReliability/TaskPhase.vue b/web/src/views/modules/taskReliability/TaskPhase.vue
index f28e47f..b2b9a27 100644
--- a/web/src/views/modules/taskReliability/TaskPhase.vue
+++ b/web/src/views/modules/taskReliability/TaskPhase.vue
@@ -24,12 +24,12 @@
<el-table-column type="selection" width="40" align="center"/>
<el-table-column prop="phaseName" label="闃舵鍚嶇О" align="center"/>
<el-table-column prop="phaseDurationRate" label="闃舵鏃堕暱姣�" align="right" width="120"/>
- <el-table-column prop="remark" label="澶囨敞" align="right" width="200"/>
+ <el-table-column prop="remark" label="澶囨敞" align="center" width="100"/>
<!-- <el-table-column prop="phaseSpeed" label="闃舵鏃堕��" align="right"/>-->
<!--<el-table-column prop="phaseSort" label="闃舵椤哄簭" align="center"/>-->
<!--<el-table-column prop="operatConditDuration" label="宸ュ喌鏃堕暱鍒嗛厤" align="center"/>-->
<zt-table-column-handle :table="table" edit-perm="testReviewComment:update"
- delete-perm="taskReliability::delete">
+ delete-perm="taskReliability::delete" width="100">
<template v-slot="{row}">
<zt-table-button type="primary" @click="openEditWin(row)">淇敼</zt-table-button>
</template>
--
Gitblit v1.9.1