【UPDATE-BUGFIX】1.计算气柜管路开工时间精确到秒 2.气柜管路规划工序列表按工序名排序

huangjiayang

2025-04-28 9684c089bf14106e3aec451517f95666cfb593bc

 aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java

@@ -42,7 +42,7 @@
     * 查询气体管路产能规划列表
     */
    @Operation(summary = "查询气体管路产能规划列表", description = "分页查询")
//    @RequiresPermissions("gasPipelineCapacityPlan:gasPipelineCapacityPlan:list")
    @RequiresPermissions("aps:gasPipelineCapacityPlan:list")
    @GetMapping("/list")
    public TableDataInfo list(ApsGasPipelineCapacityPlan apsGasPipelineCapacityPlan)
    {
@@ -57,12 +57,13 @@
                apsGasPipelineCapacityPlanTemp.setProcessName(apsStandardProcessTemp.getProcessName());
                list.add(apsGasPipelineCapacityPlanTemp);
            }
        }else if(processList.size()>list.size()){
        }
        if(processList.size()>list.size()){
            List<String> newProcess = new ArrayList<>();
            for(ApsStandardProcess apsStandardProcessTemp : processList){
                boolean flag = true;
                for(ApsGasPipelineCapacityPlan temp : list){
                    if(apsStandardProcessTemp.getMajor().equals(temp.getMajor())){
                    if(apsStandardProcessTemp.getProcessName().equals(temp.getProcessName())){
                        flag = false;
                        break;
                    }
@@ -77,6 +78,7 @@
                list.add(apsGasPipelineCapacityPlanTemp);
            }
        }
        list.sort((a, b)->a.getProcessName().compareTo(b.getProcessName()));
        return getDataTable(list);
    }

@@ -84,7 +86,7 @@
     * 导出气体管路产能规划列表
     */
    @Operation(summary = "导出气体管路产能规划列表", description = "导出")
    @RequiresPermissions("gasPipelineCapacityPlan:gasPipelineCapacityPlan:export")
    @RequiresPermissions("aps:gasPipelineCapacityPlan:export")
    @Log(title = "气体管路产能规划", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ApsGasPipelineCapacityPlan apsGasPipelineCapacityPlan)
@@ -98,7 +100,7 @@
     * 获取气体管路产能规划详细信息
     */
    @Operation(summary = "获取气体管路产能规划详细信息", description = "根据id获取")
    @RequiresPermissions("gasPipelineCapacityPlan:gasPipelineCapacityPlan:query")
    @RequiresPermissions("aps:gasPipelineCapacityPlan:query")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
@@ -109,13 +111,13 @@
     * 新增气体管路产能规划
     */
    @Operation(summary = "新增气体管路产能规划", description = "单个新增")
    @RequiresPermissions("gasPipelineCapacityPlan:gasPipelineCapacityPlan:add")
    @RequiresPermissions("aps:gasPipelineCapacityPlan:add")
    @Log(title = "气体管路产能规划", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody List<ApsGasPipelineCapacityPlan> apsGasPipelineCapacityPlan)
    {
        apsGasPipelineCapacityPlan.forEach(apsGasPipelineCapacityPlanTemp -> {
            if(apsGasPipelineCapacityPlanTemp.getId()!=null){
            if(apsGasPipelineCapacityPlanTemp.getId()==null){
                apsGasPipelineCapacityPlanService.insertApsGasPipelineCapacityPlan(apsGasPipelineCapacityPlanTemp);
            }else{
                apsGasPipelineCapacityPlanService.updateApsGasPipelineCapacityPlan(apsGasPipelineCapacityPlanTemp);
@@ -128,7 +130,7 @@
     * 修改气体管路产能规划
     */
    @Operation(summary = "修改气体管路产能规划", description = "单个修改")
    @RequiresPermissions("gasPipelineCapacityPlan:gasPipelineCapacityPlan:edit")
    @RequiresPermissions("aps:gasPipelineCapacityPlan:edit")
    @Log(title = "气体管路产能规划", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody ApsGasPipelineCapacityPlan apsGasPipelineCapacityPlan)
@@ -140,7 +142,7 @@
     * 删除气体管路产能规划
     */
    @Operation(summary = "删除气体管路产能规划", description = "批量删除")
    @RequiresPermissions("gasPipelineCapacityPlan:gasPipelineCapacityPlan:remove")
    @RequiresPermissions("aps:gasPipelineCapacityPlan:remove")
    @Log(title = "气体管路产能规划", businessType = BusinessType.DELETE)
   @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)