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); 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); } 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; 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); } } 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> 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"/> 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> 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>
