From fa1fb9eb85fb5f0a96a81f51b4c76777c7027cb9 Mon Sep 17 00:00:00 2001 From: Yen Date: Tue, 27 Sep 2022 16:42:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9mssql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qms/controller/QmsGroupController.java | 25 ++++--------------- .../controller/api/QmsDraftApiController.java | 2 ++ .../qs/serve/modules/qms/entity/QmsDraft.java | 2 +- .../modules/qms/entity/QmsFormSubmit.java | 2 +- .../modules/qms/entity/QmsGroupScope.java | 2 +- .../impl/QmsFormSubmitServiceImpl.java | 2 ++ .../impl/QmsGroupScopeServiceImpl.java | 5 ++++ 7 files changed, 17 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/qms/controller/QmsGroupController.java b/src/main/java/com/qs/serve/modules/qms/controller/QmsGroupController.java index 58c3af9d..40448e19 100644 --- a/src/main/java/com/qs/serve/modules/qms/controller/QmsGroupController.java +++ b/src/main/java/com/qs/serve/modules/qms/controller/QmsGroupController.java @@ -122,18 +122,9 @@ public class QmsGroupController { QmsForm qmsForm = qmsFormService.getById(qmsGroup.getFormId()); qmsGroup.setFormContext(qmsForm.getFormContext()); qmsGroup.setVersion(qmsForm.getVersion()); - try { - qmsGroupService.updateById(qmsGroup); - } catch (Exception e) { - } - try { - qmsGroupScopeService.removeByGroupId(qmsGroup.getId()); - } catch (Exception e) { - } - try { - qmsGroupScopeService.saveByBo(qmsGroup.getId(),param); - } catch (Exception e) { - } + qmsGroupService.updateById(qmsGroup); + qmsGroupScopeService.removeByGroupId(qmsGroup.getId()); + qmsGroupScopeService.saveByBo(qmsGroup.getId(),param); return R.ok(); } @@ -153,14 +144,8 @@ public class QmsGroupController { } qmsGroup.setPublishState(1); qmsGroup.setPublishTime(LocalDateTime.now()); - try { - qmsGroupService.updateById(qmsGroup); - } catch (Exception e) { - } - try { - this.qmsGroupScopeService.publish(groupId); - } catch (Exception e) { - } + qmsGroupService.updateById(qmsGroup); + this.qmsGroupScopeService.publish(groupId); return R.ok(); } diff --git a/src/main/java/com/qs/serve/modules/qms/controller/api/QmsDraftApiController.java b/src/main/java/com/qs/serve/modules/qms/controller/api/QmsDraftApiController.java index 430b565c..09a4e07f 100644 --- a/src/main/java/com/qs/serve/modules/qms/controller/api/QmsDraftApiController.java +++ b/src/main/java/com/qs/serve/modules/qms/controller/api/QmsDraftApiController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.qs.serve.common.model.dto.R; import com.qs.serve.common.util.AuthContextUtils; import com.qs.serve.common.util.CopierUtil; +import com.qs.serve.common.util.IdUtil; import com.qs.serve.modules.qms.entity.bo.QmsDraftBo; import com.qs.serve.modules.qms.entity.vo.QmsDraftVo; import com.qs.serve.modules.sys.entity.SysUser; @@ -53,6 +54,7 @@ public class QmsDraftApiController { QmsDraft qmsDraft = qmsDraftService.getUserFormDraft(param.getGroupId()); if(qmsDraft==null){ qmsDraft = new QmsDraft(); + qmsDraft.setId(IdUtil.getSnowFlakeId()); qmsDraft.setGroupId(param.getGroupId()); qmsDraft.setContext(param.getContext()); qmsDraft.setUserId(AuthContextUtils.getWxUserId()); diff --git a/src/main/java/com/qs/serve/modules/qms/entity/QmsDraft.java b/src/main/java/com/qs/serve/modules/qms/entity/QmsDraft.java index d8c89889..f6ada089 100644 --- a/src/main/java/com/qs/serve/modules/qms/entity/QmsDraft.java +++ b/src/main/java/com/qs/serve/modules/qms/entity/QmsDraft.java @@ -26,7 +26,7 @@ public class QmsDraft implements Serializable { private static final long serialVersionUID = 1L; /** id */ - @TableId(type = IdType.AUTO) + @TableId(type = IdType.INPUT) private Long id; /** 用户id */ diff --git a/src/main/java/com/qs/serve/modules/qms/entity/QmsFormSubmit.java b/src/main/java/com/qs/serve/modules/qms/entity/QmsFormSubmit.java index e5e806a6..12fd13b8 100644 --- a/src/main/java/com/qs/serve/modules/qms/entity/QmsFormSubmit.java +++ b/src/main/java/com/qs/serve/modules/qms/entity/QmsFormSubmit.java @@ -26,7 +26,7 @@ public class QmsFormSubmit implements Serializable { private static final long serialVersionUID = 1L; /** id */ - @TableId(type = IdType.AUTO) + @TableId(type = IdType.INPUT) private Long id; /** 标题 */ diff --git a/src/main/java/com/qs/serve/modules/qms/entity/QmsGroupScope.java b/src/main/java/com/qs/serve/modules/qms/entity/QmsGroupScope.java index 76373599..bdd1ea7b 100644 --- a/src/main/java/com/qs/serve/modules/qms/entity/QmsGroupScope.java +++ b/src/main/java/com/qs/serve/modules/qms/entity/QmsGroupScope.java @@ -26,7 +26,7 @@ public class QmsGroupScope implements Serializable { private static final long serialVersionUID = 1L; /** */ - @TableId(type = IdType.AUTO) + @TableId(type = IdType.INPUT) private Long id; /** */ diff --git a/src/main/java/com/qs/serve/modules/qms/service/impl/QmsFormSubmitServiceImpl.java b/src/main/java/com/qs/serve/modules/qms/service/impl/QmsFormSubmitServiceImpl.java index 93ca0cd5..5790bdb5 100644 --- a/src/main/java/com/qs/serve/modules/qms/service/impl/QmsFormSubmitServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/qms/service/impl/QmsFormSubmitServiceImpl.java @@ -6,6 +6,7 @@ import com.qs.serve.common.framework.security.model.LoginUser; import com.qs.serve.common.util.Assert; import com.qs.serve.common.util.AuthContextUtils; import com.qs.serve.common.util.CopierUtil; +import com.qs.serve.common.util.IdUtil; import com.qs.serve.modules.qms.entity.QmsForm; import com.qs.serve.modules.qms.entity.QmsGroup; import com.qs.serve.modules.qms.entity.QmsGroupScope; @@ -74,6 +75,7 @@ public class QmsFormSubmitServiceImpl extends ServiceImpl{ + obj.setId(IdUtil.getSnowFlakeId()); + }); this.saveBatch(list); } @@ -110,6 +114,7 @@ public class QmsGroupScopeServiceImpl extends ServiceImpl sysUsers = sysUserMapper.selectList(lqw); for (SysUser sysUser : sysUsers) { QmsGroupScope groupScope2 = new QmsGroupScope(); + groupScope2.setId(IdUtil.getSnowFlakeId()); groupScope2.setGroupId(groupId); groupScope2.setScopeType(isDeptType?3:4); groupScope2.setFinished(0);