fix: 修复日期解析Bug

2023-10-12 14:23:45 +08:00
parent 07c3bedac0
commit 9bca6e2a69
6 changed files with 63 additions and 5 deletions
@@ -4,6 +4,7 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.modules.activiti.process.common.entity.CenterQueryVO;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
+import com.jero.modules.activiti.process.common.service.ProcessDraftService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -23,6 +24,9 @@ import javax.validation.Valid;
@RequestMapping("/process/center")
 public class ProcessCenterController {

+    @Resource
+    private ProcessDraftService draftService;
+
    @Resource
    private ActFlowCommonService actFlowCommonService;

@@ -83,7 +87,6 @@ public class ProcessCenterController {
    @ApiOperation(value="流程中心-草稿", notes="流程中心-草稿")
    @GetMapping("/draftList")
    public Result<?> draftList(@Valid CenterQueryVO centerQueryVO) {
-        // TODO
-        return Result.OK();
+        return Result.OK(draftService.getDraftList(centerQueryVO));
    }
 }
@@ -0,0 +1,16 @@
+package com.jero.modules.activiti.process.common.entity;
+
+import lombok.Data;
+
+/**
+ * @author: Mzaxd
+ * @Date: 2023/10/12 13:52
+ */
+@Data
+public class ProcessCenterListVO {
+
+
+
+
+
+}
@@ -1,8 +1,12 @@
 package com.jero.modules.activiti.process.common.service;

+import com.jero.modules.activiti.process.common.entity.CenterQueryVO;
+import com.jero.modules.activiti.process.common.entity.ProcessCenterListVO;
 import com.jero.modules.activiti.process.common.entity.ProcessDraft;
 import com.baomidou.mybatisplus.extension.service.IService;

+import java.util.List;
+
 /**
 * @author ThinkBook
 * @description 针对表【process_draft】的数据库操作Service
@@ -10,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
 */
 public interface ProcessDraftService extends IService<ProcessDraft> {

+    List<ProcessCenterListVO> getDraftList(CenterQueryVO centerQueryVO);
 }
@@ -1,11 +1,17 @@
 package com.jero.modules.activiti.process.common.service.impl;

+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.modules.activiti.process.common.entity.CenterQueryVO;
+import com.jero.modules.activiti.process.common.entity.ProcessCenterListVO;
 import com.jero.modules.activiti.process.common.entity.ProcessDraft;
 import com.jero.modules.activiti.process.common.service.ProcessDraftService;
 import com.jero.modules.activiti.process.common.mapper.ProcessDraftMapper;
+import com.jero.modules.sys.utils.UserUtils;
 import org.springframework.stereotype.Service;

+import java.util.List;
+
 /**
 * @author ThinkBook
 * @description 针对表【process_draft】的数据库操作Service实现
@@ -15,6 +21,14 @@ import org.springframework.stereotype.Service;
 public class ProcessDraftServiceImpl extends ServiceImpl<ProcessDraftMapper, ProcessDraft>
    implements ProcessDraftService {

+    @Override
+    public List<ProcessCenterListVO> getDraftList(CenterQueryVO centerQueryVO) {
+        String userId = UserUtils.getUserId();
+        LambdaQueryWrapper<ProcessDraft> draftWrapper = new LambdaQueryWrapper<>();
+        draftWrapper.eq(ProcessDraft::getCreateBy, userId);
+        List<ProcessDraft> list = list(draftWrapper);
+        return null;
+    }
 }


@@ -7,11 +7,13 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;

+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;

 import javax.validation.constraints.NotBlank;

@@ -74,6 +76,8 @@ public class ProcessEsInitChange implements Serializable {
    /**
     * 截止日期
     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
    private Date deadlineDate;

    /**
@@ -135,13 +139,11 @@ public class ProcessEsInitChange implements Serializable {
    /**
     * 标准类别代号
     */
-    @NotBlank
    private String standardCategoryCode;

    /**
     * 年代号
     */
-    @NotBlank
    private String decadeCode;

    /**
@@ -157,16 +159,22 @@ public class ProcessEsInitChange implements Serializable {
    /**
     * 草稿计划完成日期
     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
    private Date draftPlannedCompleteDate;

    /**
     * 征求意见稿计划完成日期
     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
    private Date solicitationDraftPlanCompleteDate;

    /**
     * 计划报批日期
     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
    private Date planApprovalDate;

    /**
@@ -207,11 +215,15 @@ public class ProcessEsInitChange implements Serializable {
    /**
     * 草稿完成日期
     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
    private Date draftCompletionDate;

    /**
     * 提交草稿日期
     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
    private Date draftSubmissionDate;

    /**
@@ -222,21 +234,29 @@ public class ProcessEsInitChange implements Serializable {
    /**
     * 征求意见稿完成日期
     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
    private Date solicitationDraftCompletionDate;

    /**
     * 评审日期
     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
    private Date reviewDate;

    /**
     * 报批日期
     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
    private Date approvalDate;

    /**
     * 发布日期
     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
    private Date releaseDate;

    /**
@@ -94,7 +94,7 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
        ProcessEsInitChange initChange = esInitChangeList.get(0);

        // 对数据进行其他操作
-        String beanName = "initChangeService";
+        String beanName = "processEsInitChangeServiceImpl";

        ProcessInstance processInstance = actFlowCommonService.startProcess(processDefinitionKey, beanName, initChange.getId());