【UPDATE】1.增加标准工序导入功能 2.修改日历功能字段类型

huangjiayang

2025-04-23 2a2edd2c92bbef5765b1bf96bc7a42986a26efc4

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

@@ -6,6 +6,7 @@
import com.aps.common.core.web.page.TableDataInfo;
import com.aps.common.log.annotation.Log;
import com.aps.common.log.enums.BusinessType;
import com.aps.common.security.annotation.RequiresPermissions;
import com.aps.core.domain.ApsResourceGroup;
import com.aps.core.domain.ApsResourceGroupTemp;
import com.aps.core.service.IApsResourceGroupService;
@@ -37,7 +38,7 @@
    /**
     * 查询资源组列表
     */
    /*@RequiresPermissions("ApsResourceGroup:list")*/
    @RequiresPermissions("ApsResourceGroup:list")
    @GetMapping("/list")
    public TableDataInfo list(ApsResourceGroup apsResourceGroup)
    {
@@ -49,7 +50,7 @@
    /**
     * 导出资源组列表
     */
    /*@RequiresPermissions("ApsResourceGroup:ApsResourceGroup:export")*/
    @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:export")
    @Log(title = "资源组", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ApsResourceGroup apsResourceGroup)
@@ -62,7 +63,7 @@
    /**
     * 获取资源组详细信息
     */
   /* @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:query")*/
    @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:query")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") String id)
    {
@@ -72,7 +73,7 @@
    /**
     * 新增资源组
     */
   /* @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:add")*/
    @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:add")
    @Log(title = "资源组", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody ApsResourceGroup apsResourceGroup)
@@ -83,7 +84,7 @@
    /**
     * 修改资源组
     */
    /*@RequiresPermissions("ApsResourceGroup:ApsResourceGroup:edit")*/
    @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:edit")
    @Log(title = "资源组", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody ApsResourceGroup apsResourceGroup)
@@ -94,7 +95,7 @@
    /**
     * 删除资源组
     */
    /*@RequiresPermissions("ApsResourceGroup:ApsResourceGroup:remove")*/
    @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:remove")
    @Log(title = "资源组", businessType = BusinessType.DELETE)
   @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable String[] ids)
@@ -112,6 +113,7 @@
    /**
     * 导入资源组
     */
    @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:importData")
    @PostMapping("/importData")
    public AjaxResult importData(MultipartFile file) throws Exception {
        ExcelUtil<ApsResourceGroupTemp> util = new ExcelUtil<>(ApsResourceGroupTemp.class);
@@ -127,11 +129,12 @@
    /**
     * 确认数据
     */
    @RequiresPermissions("ApsResourceGroup:ApsResourceGroup:confirmData")
    @PostMapping("/confirmData")
    public AjaxResult confirmData(@RequestBody ApsResourceGroupTemp temp) {
//        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
//        LocalDateTime localDateTime = LocalDateTime.parse(temp.getParams().get("requestDate").toString(), formatter);
        apsResourceGroupService.confirmData(temp.getBatchNumber(),temp.getRequestDate());
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
        LocalDateTime localDateTime = LocalDateTime.parse(temp.getParams().get("requestDate").toString(), formatter);
        apsResourceGroupService.confirmData(temp.getBatchNumber(),localDateTime);
        return AjaxResult.success("确认成功！");
    }
}