From fe8cc41061d27bf94ac57a5ccfa3b4b5b5f3edb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Fri, 25 Aug 2023 02:31:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A72.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mdp/form/service/FormDataService.java | 42 ++++++++++++------- .../com/mdp/form/service/FormDefService.java | 19 ++++----- .../mdp/form/service/FormFieldService.java | 5 ++- 3 files changed, 41 insertions(+), 25 deletions(-) diff --git a/mdp-form/src/main/java/com/mdp/form/service/FormDataService.java b/mdp-form/src/main/java/com/mdp/form/service/FormDataService.java index 7944b0a..fb40372 100644 --- a/mdp-form/src/main/java/com/mdp/form/service/FormDataService.java +++ b/mdp-form/src/main/java/com/mdp/form/service/FormDataService.java @@ -1,6 +1,7 @@ package com.mdp.form.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.mdp.core.utils.BaseUtils; import com.mdp.form.FormUtil; @@ -9,6 +10,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.*; +import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -57,12 +59,11 @@ public class FormDataService extends BaseService { * @param tagNames */ public void updateTagsByDataId(String dataId, String tagIds, String tagNames) { - // TODO Auto-generated method stub - Map p=new HashMap<>(); - p.put("id", dataId); - p.put("tagIds", tagIds); - p.put("tagNames", tagNames); - this.update("updateTagsById", p); + UpdateWrapper uw=new UpdateWrapper<>(); + uw.set("tag_ids",tagIds); + uw.set("tag_names",tagNames); + uw.eq("id",dataId); + super.update(uw); } @@ -77,7 +78,8 @@ public class FormDataService extends BaseService { p.put("flowState", flowState); p.put("formId", formId); p.put("procInstId", procInstId); - this.update("updateFlowStateByProcInst", p); + + this.baseMapper.updateFlowStateByProcInst(p); } /** * 智能表单直接操作时调用，检查流程状态，如果是审核通过和审核中，不允许更改数据 @@ -213,14 +215,18 @@ public class FormDataService extends BaseService { } if(needInsertList.size()>0) { - this.batchInsert(needInsertList); + this.saveBatch(needInsertList.stream().map(k->(FormData)k).collect(Collectors.toList())); } if(needUpdateList.size()>0) { if(updateFlowState) { - this.batchUpdate(formDatas); + this.updateBatchById(formDatas.stream().map(k->(FormData)k).collect(Collectors.toList())); }else { - this.update("batchUpdateWithoutFlowState", formDatas); + this.updateBatchById(formDatas.stream().map(k->{ + k.setFlowState(null); + return (FormData)k; + }).collect(Collectors.toList())); + } } @@ -318,8 +324,9 @@ public class FormDataService extends BaseService { } private int updateSomeFieldsByProcInstId(Map needUpdateFormDataMap) { - - return this.update("updateSomeFieldsByProcInstId", needUpdateFormDataMap); + UpdateWrapper uw=new UpdateWrapper<>(); + uw.exists(" SELECT 1 FROM form_data_process_approva a where a.proc_inst_id = {0} AND a.form_data_id = form_data.id",needUpdateFormDataMap.get("procInstId")); + return super.update(BaseUtils.fromMap(needUpdateFormDataMap,FormData.class),uw)?1:0; } /** @@ -336,7 +343,7 @@ public class FormDataService extends BaseService { if(StringUtils.isEmpty(fieldBizKey) ) { return tips; }else if( fieldBizKey.length()!=3) { - tips.setFailureMsg("is-biz-key-err-001", "isBizKey", "表单字段定义的主键编码错误"); + tips.setErrMsg("is-biz-key-err-001", "表单字段定义的主键编码错误"); return tips; } boolean hasPrefix=false; @@ -377,7 +384,14 @@ public class FormDataService extends BaseService { public FormData getDbFormDataByBizKey(String bizKey){ - return this.selectOne("getDbFormDataByBizKey", bizKey); + QueryWrapper qw=new QueryWrapper<>(); + qw.eq("biz_key",bizKey); + List formDatas= super.list(qw); + if(formDatas!=null && formDatas.size()>0){ + return formDatas.get(0); + }else{ + return null; + } } } diff --git a/mdp-form/src/main/java/com/mdp/form/service/FormDefService.java b/mdp-form/src/main/java/com/mdp/form/service/FormDefService.java index d561a24..ae673fa 100644 --- a/mdp-form/src/main/java/com/mdp/form/service/FormDefService.java +++ b/mdp-form/src/main/java/com/mdp/form/service/FormDefService.java @@ -1,6 +1,7 @@ package com.mdp.form.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.mdp.form.entity.FormDefVo; import com.mdp.form.entity.FormField; @@ -63,18 +64,16 @@ public class FormDefService extends BaseService { * @param tagNames */ public void updateTagsByFormId(String formId, String tagIds, String tagNames) { - // TODO Auto-generated method stub - Map p=new HashMap<>(); - p.put("id", formId); - p.put("tagIds", tagIds); - p.put("tagNames", tagNames); - this.update("updateTagsById", p); + UpdateWrapper uw=new UpdateWrapper<>(); + uw.set("tag_ids",tagIds); + uw.set("tag_names",tagNames); + uw.eq("id",formId); + super.update(uw); } @Transactional public void addFormDefAndFields(FormDefVo formDefVo) { User user= LoginUtils.getCurrentUserInfo(); - // TODO Auto-generated method stub FormDef formDef=formDefVo.getFormDef(); String formId= this.createKey("id"); formDef.setId(formId); @@ -97,8 +96,8 @@ public class FormDefService extends BaseService { formField.setFormId(formDef.getId()); formField.setId(ffs.createKey("id")); } - this.insert("insert",formDef); - this.ffs.batchInsert("insert",formFields); + super.insert(formDef); + this.ffs.saveBatch(formFields); formFieldCacheService.putFormFields(formId, formDefVo); } @@ -129,7 +128,7 @@ public class FormDefService extends BaseService { this.updateByPk(formDef); this.ffs.deleteByFormId(formDef.getId()); this.ffs.batchDelete( formFields); - this.ffs.batchInsert(formFields); + this.ffs.saveBatch(formFields); formFieldCacheService.putFormFields(formDef.getId(), formDefVo); diff --git a/mdp-form/src/main/java/com/mdp/form/service/FormFieldService.java b/mdp-form/src/main/java/com/mdp/form/service/FormFieldService.java index dba8e99..c755a46 100644 --- a/mdp-form/src/main/java/com/mdp/form/service/FormFieldService.java +++ b/mdp-form/src/main/java/com/mdp/form/service/FormFieldService.java @@ -1,6 +1,7 @@ package com.mdp.form.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.mdp.form.entity.FormDef; import com.mdp.form.entity.FormDefVo; @@ -47,7 +48,9 @@ public class FormFieldService extends BaseService { public void deleteByFormId(String formId) { - this.delete("deleteByFormId", formId); + UpdateWrapper uw= new UpdateWrapper(); + uw.eq("form_id",formId); + super.remove(uw); }