兼容mssql

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);
-            qmsGroupService.updateById(qmsGroup);
+        qmsGroupScopeService.removeByGroupId(qmsGroup.getId());
-        } catch (Exception e) {
+        qmsGroupScopeService.saveByBo(qmsGroup.getId(),param);
-        }
-        try {
-            qmsGroupScopeService.removeByGroupId(qmsGroup.getId());
-        } catch (Exception e) {
-        }
-        try {
-            qmsGroupScopeService.saveByBo(qmsGroup.getId(),param);
-        } catch (Exception e) {
-        }
         return R.ok();
     }
 
@@ -153,14 +144,8 @@ public class QmsGroupController {
         }
         qmsGroup.setPublishState(1);
         qmsGroup.setPublishTime(LocalDateTime.now());
-        try {
+        qmsGroupService.updateById(qmsGroup);
-            qmsGroupService.updateById(qmsGroup);
+        this.qmsGroupScopeService.publish(groupId);
-        } catch (Exception e) {
-        }
-        try {
-            this.qmsGroupScopeService.publish(groupId);
-        } catch (Exception e) {
-        }
         return R.ok();
     }
 

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());

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 */

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;
 
     /** 标题 */

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;
 
     /**  */

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<QmsFormSubmitMapper,Qm
         //时间
         formSubmit.setSubmitTime(LocalDateTime.now());
         if(formSubmit.getId()==null){
+            formSubmit.setId(IdUtil.getSnowFlakeId());
             this.save(formSubmit);
         }else {
             this.updateById(formSubmit);

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qs.serve.common.util.Assert;
 import com.qs.serve.common.util.CollectionUtil;
+import com.qs.serve.common.util.IdUtil;
 import com.qs.serve.modules.qms.entity.QmsGroup;
 import com.qs.serve.modules.qms.entity.bo.QmsGroupBo;
 import com.qs.serve.modules.qms.service.QmsGroupService;
@@ -88,6 +89,9 @@ public class QmsGroupScopeServiceImpl extends ServiceImpl<QmsGroupScopeMapper,Qm
                 list.add(groupScope);
             }
         }
+        list.forEach(obj->{
+            obj.setId(IdUtil.getSnowFlakeId());
+        });
         this.saveBatch(list);
     }
 
@@ -110,6 +114,7 @@ public class QmsGroupScopeServiceImpl extends ServiceImpl<QmsGroupScopeMapper,Qm
                 List<SysUser> 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);