调整

pom.xml

@@ -168,6 +168,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.tencentcloudapi</groupId>
+            <artifactId>tencentcloud-sdk-java</artifactId>
+            <version>3.1.598</version>
+        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

src/main/java/com/qs/serve/modules/qms/controller/QmsGroupController.java

@@ -11,6 +11,7 @@ import com.qs.serve.common.model.enums.SystemModule;
 import com.qs.serve.common.util.CollectionUtil;
 import com.qs.serve.common.util.CopierUtil;
 import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.util.StringUtils;
 import com.qs.serve.modules.qms.entity.QmsForm;
 import com.qs.serve.modules.qms.entity.QmsGroupScope;
 import com.qs.serve.modules.qms.entity.bo.QmsGroupBo;
@@ -31,6 +32,7 @@ import com.qs.serve.modules.qms.entity.QmsGroup;
 import com.qs.serve.modules.qms.service.QmsGroupService;
 
 import javax.validation.Valid;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -139,6 +141,7 @@ public class QmsGroupController {
             return R.error("请勿重新发布");
         }
         qmsGroup.setPublishState(1);
+        qmsGroup.setPublishTime(LocalDateTime.now());
         qmsGroupService.updateById(qmsGroup);
         this.qmsGroupScopeService.publish(groupId);
         //todo 发送推送
@@ -182,7 +185,7 @@ public class QmsGroupController {
     @GetMapping("/unfinishedList")
     public R<?> unfinishedList(String finished,String groupId){
         LambdaQueryWrapper<QmsGroupScope> lqw = new LambdaQueryWrapper<>();
-        if(finished!=null){
+        if(StringUtils.hasText(finished)){
             lqw.eq(QmsGroupScope::getFinished,finished);
         }else {
             lqw.ne(QmsGroupScope::getFinished,-1);

src/main/java/com/qs/serve/modules/qms/controller/api/QmsDraftApiController.java

@@ -53,12 +53,10 @@ public class QmsDraftApiController {
             qmsDraft.setGroupId(param.getGroupId());
             qmsDraft.setContext(param.getContext());
             qmsDraft.setUserId(AuthContextUtils.getWxUserId());
-            qmsDraft.setVersion(param.getVersion());
             qmsDraft.setPubFlag("0");
             qmsDraftService.save(qmsDraft);
         }else {
             qmsDraft.setContext(param.getContext());
-            qmsDraft.setVersion(param.getVersion());
             qmsDraftService.updateById(qmsDraft);
         }
         return R.ok();

src/main/java/com/qs/serve/modules/qms/controller/api/QmsSubmitApiController.java

@@ -8,12 +8,16 @@ import com.qs.serve.common.model.enums.BizType;
 import com.qs.serve.common.model.enums.InterType;
 import com.qs.serve.common.model.enums.SystemModule;
 import com.qs.serve.common.util.AuthContextUtils;
+import com.qs.serve.common.util.CopierUtil;
 import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.modules.qms.entity.QmsForm;
 import com.qs.serve.modules.qms.entity.QmsFormSubmit;
 import com.qs.serve.modules.qms.entity.QmsGroup;
 import com.qs.serve.modules.qms.entity.QmsGroupScope;
 import com.qs.serve.modules.qms.entity.bo.QmsSubmitBo;
 import com.qs.serve.modules.qms.mapper.QmsGroupMapper;
+import com.qs.serve.modules.qms.service.QmsFormService;
 import com.qs.serve.modules.qms.service.QmsFormSubmitService;
 import com.qs.serve.modules.qms.service.QmsGroupScopeService;
 import com.qs.serve.modules.qms.service.QmsGroupService;
@@ -47,6 +51,7 @@ public class QmsSubmitApiController {
     private QmsGroupScopeService qmsGroupScopeService;
     private QmsGroupService qmsGroupService;
     private WxUserService wxUserService;
+    private QmsFormService qmsFormService;
 
     /**
      * 我的代办、已办列表
@@ -60,7 +65,8 @@ public class QmsSubmitApiController {
         LambdaQueryWrapper<QmsGroupScope> lqw = new LambdaQueryWrapper<>();
         lqw.in(QmsGroupScope::getScopeType,1,3);
         lqw.eq(QmsGroupScope::getScopeValue,userId);
-        if(finished!=null){
+        lqw.orderByDesc(QmsGroupScope::getCreateTime);
+        if(StringUtils.hasText(finished)){
             lqw.eq(QmsGroupScope::getFinished,finished);
         }else {
             lqw.ne(QmsGroupScope::getFinished,-1);
@@ -70,6 +76,7 @@ public class QmsSubmitApiController {
         List<QmsGroup> result = new ArrayList<>();
         for (QmsGroupScope groupScope : groupScopes) {
             QmsGroup qmsGroup = qmsGroupService.getById(groupScope.getGroupId());
+            qmsGroup.setFinished(groupScope.getFinished());
             result.add(qmsGroup);
         }
         return R.byPageHelperList(groupScopes,result);
@@ -104,9 +111,8 @@ public class QmsSubmitApiController {
         return R.ok(qmsFormSubmit);
     }
 
-
     /**
-     * 根据表单ID查询
+     * 根据发布组ID查询
      * @param groupId
      * @return
      */
@@ -118,8 +124,10 @@ public class QmsSubmitApiController {
         lqw.eq(QmsFormSubmit::getGroupId,groupId);
         lqw.eq(QmsFormSubmit::getUserId,userId);
         QmsFormSubmit formSubmit = qmsFormSubmitService.getOne(lqw,false);
-        if(formSubmit==null || !formSubmit.getUserId().equals(userId)){
-            return R.ok();
+        if(formSubmit==null){
+            QmsGroup qmsGroup = qmsGroupService.getById(groupId);
+            formSubmit = CopierUtil.copy(qmsGroup,new QmsFormSubmit());
+            formSubmit.setTitle(qmsGroup.getName());
         }
         return R.ok(formSubmit);
     }

src/main/java/com/qs/serve/modules/qms/entity/QmsFormSubmit.java

@@ -38,6 +38,8 @@ public class QmsFormSubmit implements Serializable {
     @Length(max = 255,message = "子标题长度不能超过255字")
     private String subtitle;
 
+    private String formTitle;
+
     /** 分类id */
     private Long categoryId;
 

src/main/java/com/qs/serve/modules/qms/entity/QmsGroup.java

@@ -55,6 +55,12 @@ public class QmsGroup implements Serializable {
     @NotNull(message = "发布状态不能为空")
     private Integer publishState;
 
+    /** 发布时间 */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime publishTime;
+
     /** 表单版本 */
     private Integer version;
 
@@ -111,5 +117,8 @@ public class QmsGroup implements Serializable {
     @TableField(exist = false)
     private QmsForm formInfo;
 
+    @TableField(exist = false)
+    private Integer finished;
+
 }
 

src/main/java/com/qs/serve/modules/qms/entity/QmsGroupScope.java

@@ -41,5 +41,30 @@ public class QmsGroupScope implements Serializable {
     @Length(max = 32,message = "使用范围值长度不能超过32字")
     private String scopeValue;
 
+    /** 删除标识 */
+    @JsonIgnore
+    @JsonProperty
+    private Boolean delFlag;
+
+    /** 创建时间 */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /** 创建人 */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /** 更新时间 */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @TableField(fill = FieldFill.UPDATE)
+    private LocalDateTime updateTime;
+
+    /** 更新人 */
+    @TableField(fill = FieldFill.UPDATE)
+    private String updateBy;
+
 }
 

src/main/java/com/qs/serve/modules/qms/entity/bo/QmsDraftBo.java

@@ -19,7 +19,4 @@ public class QmsDraftBo {
     @NotNull
     private String context;
 
-    /** 草稿内容 */
-    @NotNull
-    private Integer version;
 }

src/main/java/com/qs/serve/modules/qms/service/impl/QmsFormSubmitServiceImpl.java

@@ -56,7 +56,8 @@ public class QmsFormSubmitServiceImpl extends ServiceImpl<QmsFormSubmitMapper,Qm
         //表单关联
         formSubmit.setGroupId(param.getGroupId());
         formSubmit.setFromId(form.getId());
-        formSubmit.setTitle(form.getTitle());
+        formSubmit.setTitle(qmsGroup.getName());
+        formSubmit.setFormTitle(form.getTitle());
         formSubmit.setSubtitle(form.getSubtitle());
         formSubmit.setCategoryId(form.getCategoryId());
         formSubmit.setFormContext(form.getFormContext());