From ba57e92f24e8bc4808f2818a9ae6e7f05a239e9f 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 17:02:47 +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/mapper/FormDataMapper.java | 28 ++++++++++ .../com/mdp/form/mapper/FormDataMapper.xml | 34 +++++++++++++ .../mapper/FormDataProcessApprovaMapper.java | 25 +++++++++ .../mapper/FormDataProcessApprovaMapper.xml | 17 +++++++ .../mdp/form/mapper/FormDataTagMapper.java | 25 +++++++++ .../com/mdp/form/mapper/FormDataTagMapper.xml | 17 +++++++ .../com/mdp/form/mapper/FormDefMapper.java | 25 +++++++++ .../com/mdp/form/mapper/FormDefMapper.xml | 24 +++++++++ .../com/mdp/form/mapper/FormDefTagMapper.java | 25 +++++++++ .../com/mdp/form/mapper/FormDefTagMapper.xml | 17 +++++++ .../com/mdp/form/mapper/FormFieldMapper.java | 25 +++++++++ .../com/mdp/form/mapper/FormFieldMapper.xml | 17 +++++++ .../com/mdp/form/mapper/FormQxMapper.java | 25 +++++++++ .../java/com/mdp/form/mapper/FormQxMapper.xml | 17 +++++++ .../com/mdp/form/mapper/FormViewMapper.java | 25 +++++++++ .../com/mdp/form/mapper/FormViewMapper.xml | 17 +++++++ .../com/mdp/form/dao/TestFormViewDao.java | 51 +++++++++++++++++++ .../mdp/form/service/TestFormViewService.java | 51 +++++++++++++++++++ 18 files changed, 465 insertions(+) create mode 100644 mdp-form/src/main/java/com/mdp/form/mapper/FormDataMapper.java create mode 100644 mdp-form/src/main/java/com/mdp/form/mapper/FormDataMapper.xml create mode 100644 mdp-form/src/main/java/com/mdp/form/mapper/FormDataProcessApprovaMapper.java create mode 100644 mdp-form/src/main/java/com/mdp/form/mapper/FormDataProcessApprovaMapper.xml create mode 100644 mdp-form/src/main/java/com/mdp/form/mapper/FormDataTagMapper.java create mode 100644 mdp-form/src/main/java/com/mdp/form/mapper/FormDataTagMapper.xml create mode 100644 mdp-form/src/main/java/com/mdp/form/mapper/FormDefMapper.java create mode 100644 mdp-form/src/main/java/com/mdp/form/mapper/FormDefMapper.xml create mode 100644 mdp-form/src/main/java/com/mdp/form/mapper/FormDefTagMapper.java create mode 100644 mdp-form/src/main/java/com/mdp/form/mapper/FormDefTagMapper.xml create mode 100644 mdp-form/src/main/java/com/mdp/form/mapper/FormFieldMapper.java create mode 100644 mdp-form/src/main/java/com/mdp/form/mapper/FormFieldMapper.xml create mode 100644 mdp-form/src/main/java/com/mdp/form/mapper/FormQxMapper.java create mode 100644 mdp-form/src/main/java/com/mdp/form/mapper/FormQxMapper.xml create mode 100644 mdp-form/src/main/java/com/mdp/form/mapper/FormViewMapper.java create mode 100644 mdp-form/src/main/java/com/mdp/form/mapper/FormViewMapper.xml create mode 100644 mdp-form/src/test/java/com/mdp/form/dao/TestFormViewDao.java create mode 100644 mdp-form/src/test/java/com/mdp/form/service/TestFormViewService.java diff --git a/mdp-form/src/main/java/com/mdp/form/mapper/FormDataMapper.java b/mdp-form/src/main/java/com/mdp/form/mapper/FormDataMapper.java new file mode 100644 index 0000000..ee88271 --- /dev/null +++ b/mdp-form/src/main/java/com/mdp/form/mapper/FormDataMapper.java @@ -0,0 +1,28 @@ +package com.mdp.form.mapper; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +import com.mdp.form.entity.FormData; + +public interface FormDataMapper extends BaseMapper { + + /** + * 自定义查询,支持多表关联 + * @param page 分页条件 + * @param ew 一定要,并且必须加@Param("ew")注解 + * @param ext 如果xml中需要根据某些值进行特殊处理,可以通过这个进行传递,非必须,注解也可以不加 + * @return + */ + List> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); + + int updateSomeFieldsByProcInstId(Map needUpdateFormDataMap); + + void updateFlowStateByProcInst(Map p); +} + diff --git a/mdp-form/src/main/java/com/mdp/form/mapper/FormDataMapper.xml b/mdp-form/src/main/java/com/mdp/form/mapper/FormDataMapper.xml new file mode 100644 index 0000000..d5836b8 --- /dev/null +++ b/mdp-form/src/main/java/com/mdp/form/mapper/FormDataMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + update form_data res,form_data_process_approva app set res.flow_state=#{flowState},res.last_time=now(),app.flow_state=#{flowState},app.flow_last_time=now() + ,app.end_time=now() + where res.form_id=#{formId} and app.form_data_id=res.id and app.proc_inst_id=#{procInstId} + + \ No newline at end of file diff --git a/mdp-form/src/main/java/com/mdp/form/mapper/FormDataProcessApprovaMapper.java b/mdp-form/src/main/java/com/mdp/form/mapper/FormDataProcessApprovaMapper.java new file mode 100644 index 0000000..bc819bb --- /dev/null +++ b/mdp-form/src/main/java/com/mdp/form/mapper/FormDataProcessApprovaMapper.java @@ -0,0 +1,25 @@ +package com.mdp.form.mapper; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +import com.mdp.form.entity.FormDataProcessApprova; + +public interface FormDataProcessApprovaMapper extends BaseMapper { + + /** + * 自定义查询,支持多表关联 + * @param page 分页条件 + * @param ew 一定要,并且必须加@Param("ew")注解 + * @param ext 如果xml中需要根据某些值进行特殊处理,可以通过这个进行传递,非必须,注解也可以不加 + * @return + */ + List> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); + +} + diff --git a/mdp-form/src/main/java/com/mdp/form/mapper/FormDataProcessApprovaMapper.xml b/mdp-form/src/main/java/com/mdp/form/mapper/FormDataProcessApprovaMapper.xml new file mode 100644 index 0000000..9b1002b --- /dev/null +++ b/mdp-form/src/main/java/com/mdp/form/mapper/FormDataProcessApprovaMapper.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/mdp-form/src/main/java/com/mdp/form/mapper/FormDataTagMapper.java b/mdp-form/src/main/java/com/mdp/form/mapper/FormDataTagMapper.java new file mode 100644 index 0000000..702764b --- /dev/null +++ b/mdp-form/src/main/java/com/mdp/form/mapper/FormDataTagMapper.java @@ -0,0 +1,25 @@ +package com.mdp.form.mapper; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +import com.mdp.form.entity.FormDataTag; + +public interface FormDataTagMapper extends BaseMapper { + + /** + * 自定义查询,支持多表关联 + * @param page 分页条件 + * @param ew 一定要,并且必须加@Param("ew")注解 + * @param ext 如果xml中需要根据某些值进行特殊处理,可以通过这个进行传递,非必须,注解也可以不加 + * @return + */ + List> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); + +} + diff --git a/mdp-form/src/main/java/com/mdp/form/mapper/FormDataTagMapper.xml b/mdp-form/src/main/java/com/mdp/form/mapper/FormDataTagMapper.xml new file mode 100644 index 0000000..ed60c88 --- /dev/null +++ b/mdp-form/src/main/java/com/mdp/form/mapper/FormDataTagMapper.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/mdp-form/src/main/java/com/mdp/form/mapper/FormDefMapper.java b/mdp-form/src/main/java/com/mdp/form/mapper/FormDefMapper.java new file mode 100644 index 0000000..446b913 --- /dev/null +++ b/mdp-form/src/main/java/com/mdp/form/mapper/FormDefMapper.java @@ -0,0 +1,25 @@ +package com.mdp.form.mapper; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +import com.mdp.form.entity.FormDef; + +public interface FormDefMapper extends BaseMapper { + + /** + * 自定义查询,支持多表关联 + * @param page 分页条件 + * @param ew 一定要,并且必须加@Param("ew")注解 + * @param ext 如果xml中需要根据某些值进行特殊处理,可以通过这个进行传递,非必须,注解也可以不加 + * @return + */ + List> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); + +} + diff --git a/mdp-form/src/main/java/com/mdp/form/mapper/FormDefMapper.xml b/mdp-form/src/main/java/com/mdp/form/mapper/FormDefMapper.xml new file mode 100644 index 0000000..a78ff6f --- /dev/null +++ b/mdp-form/src/main/java/com/mdp/form/mapper/FormDefMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + \ No newline at end of file diff --git a/mdp-form/src/main/java/com/mdp/form/mapper/FormDefTagMapper.java b/mdp-form/src/main/java/com/mdp/form/mapper/FormDefTagMapper.java new file mode 100644 index 0000000..a67dc65 --- /dev/null +++ b/mdp-form/src/main/java/com/mdp/form/mapper/FormDefTagMapper.java @@ -0,0 +1,25 @@ +package com.mdp.form.mapper; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +import com.mdp.form.entity.FormDefTag; + +public interface FormDefTagMapper extends BaseMapper { + + /** + * 自定义查询,支持多表关联 + * @param page 分页条件 + * @param ew 一定要,并且必须加@Param("ew")注解 + * @param ext 如果xml中需要根据某些值进行特殊处理,可以通过这个进行传递,非必须,注解也可以不加 + * @return + */ + List> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); + +} + diff --git a/mdp-form/src/main/java/com/mdp/form/mapper/FormDefTagMapper.xml b/mdp-form/src/main/java/com/mdp/form/mapper/FormDefTagMapper.xml new file mode 100644 index 0000000..fb19bdd --- /dev/null +++ b/mdp-form/src/main/java/com/mdp/form/mapper/FormDefTagMapper.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/mdp-form/src/main/java/com/mdp/form/mapper/FormFieldMapper.java b/mdp-form/src/main/java/com/mdp/form/mapper/FormFieldMapper.java new file mode 100644 index 0000000..b9ebe91 --- /dev/null +++ b/mdp-form/src/main/java/com/mdp/form/mapper/FormFieldMapper.java @@ -0,0 +1,25 @@ +package com.mdp.form.mapper; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +import com.mdp.form.entity.FormField; + +public interface FormFieldMapper extends BaseMapper { + + /** + * 自定义查询,支持多表关联 + * @param page 分页条件 + * @param ew 一定要,并且必须加@Param("ew")注解 + * @param ext 如果xml中需要根据某些值进行特殊处理,可以通过这个进行传递,非必须,注解也可以不加 + * @return + */ + List> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); + +} + diff --git a/mdp-form/src/main/java/com/mdp/form/mapper/FormFieldMapper.xml b/mdp-form/src/main/java/com/mdp/form/mapper/FormFieldMapper.xml new file mode 100644 index 0000000..def5c49 --- /dev/null +++ b/mdp-form/src/main/java/com/mdp/form/mapper/FormFieldMapper.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/mdp-form/src/main/java/com/mdp/form/mapper/FormQxMapper.java b/mdp-form/src/main/java/com/mdp/form/mapper/FormQxMapper.java new file mode 100644 index 0000000..5c68c47 --- /dev/null +++ b/mdp-form/src/main/java/com/mdp/form/mapper/FormQxMapper.java @@ -0,0 +1,25 @@ +package com.mdp.form.mapper; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +import com.mdp.form.entity.FormQx; + +public interface FormQxMapper extends BaseMapper { + + /** + * 自定义查询,支持多表关联 + * @param page 分页条件 + * @param ew 一定要,并且必须加@Param("ew")注解 + * @param ext 如果xml中需要根据某些值进行特殊处理,可以通过这个进行传递,非必须,注解也可以不加 + * @return + */ + List> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); + +} + diff --git a/mdp-form/src/main/java/com/mdp/form/mapper/FormQxMapper.xml b/mdp-form/src/main/java/com/mdp/form/mapper/FormQxMapper.xml new file mode 100644 index 0000000..2273f9b --- /dev/null +++ b/mdp-form/src/main/java/com/mdp/form/mapper/FormQxMapper.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/mdp-form/src/main/java/com/mdp/form/mapper/FormViewMapper.java b/mdp-form/src/main/java/com/mdp/form/mapper/FormViewMapper.java new file mode 100644 index 0000000..95f5f50 --- /dev/null +++ b/mdp-form/src/main/java/com/mdp/form/mapper/FormViewMapper.java @@ -0,0 +1,25 @@ +package com.mdp.form.mapper; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +import com.mdp.form.entity.FormView; + +public interface FormViewMapper extends BaseMapper { + + /** + * 自定义查询,支持多表关联 + * @param page 分页条件 + * @param ew 一定要,并且必须加@Param("ew")注解 + * @param ext 如果xml中需要根据某些值进行特殊处理,可以通过这个进行传递,非必须,注解也可以不加 + * @return + */ + List> selectListMapByWhere(IPage page, @Param("ew") QueryWrapper ew,@Param("ext") Map ext); + +} + diff --git a/mdp-form/src/main/java/com/mdp/form/mapper/FormViewMapper.xml b/mdp-form/src/main/java/com/mdp/form/mapper/FormViewMapper.xml new file mode 100644 index 0000000..d6422b9 --- /dev/null +++ b/mdp-form/src/main/java/com/mdp/form/mapper/FormViewMapper.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/mdp-form/src/test/java/com/mdp/form/dao/TestFormViewDao.java b/mdp-form/src/test/java/com/mdp/form/dao/TestFormViewDao.java new file mode 100644 index 0000000..430a68f --- /dev/null +++ b/mdp-form/src/test/java/com/mdp/form/dao/TestFormViewDao.java @@ -0,0 +1,51 @@ +package com.mdp.form.dao; + +import java.util.*; +import java.text.SimpleDateFormat; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.ContextHierarchy; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.core.dao.BaseDao; +import com.mdp.mybatis.PageUtils; +import com.github.pagehelper.Page; +import com.mdp.form.entity.FormView; +import org.springframework.boot.test.context.SpringBootTest; +/** + * FormViewDao的测试案例 + * 组织 com
+ * 顶级模块 mdp
+ * 大模块 form
+ * 小模块
+ * 表 form_view 表单页面
+ * 实体 FormView
+ * 表是指数据库结构中的表,实体是指java类型中的实体类
+ * 当前实体所有属性名:
+ * formId,id,viewContext,bizId;
+ * 当前表的所有字段名:
+ * form_id,id,view_context,biz_id;
+ * 当前主键(包括多主键):
+ * id;
+ ***/ + @RunWith(SpringJUnit4ClassRunner.class) + @SpringBootTest +public class TestFormViewDao { + + @Autowired + BaseDao baseDao; + + /** + * 新增一条数据 + ***/ + @Test + public void insert() { + Map p=BaseUtils.map("formId","PgDs","id","9LY2","viewContext","x8Jn","bizId","3FDr"); + FormView formView=BaseUtils.fromMap(p,FormView.class); + baseDao.insert(formView); + //Assert.assertEquals(1, result); + } +} diff --git a/mdp-form/src/test/java/com/mdp/form/service/TestFormViewService.java b/mdp-form/src/test/java/com/mdp/form/service/TestFormViewService.java new file mode 100644 index 0000000..d97c92f --- /dev/null +++ b/mdp-form/src/test/java/com/mdp/form/service/TestFormViewService.java @@ -0,0 +1,51 @@ +package com.mdp.form.service; + +import java.util.*; +import java.text.SimpleDateFormat; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.ContextHierarchy; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import com.mdp.core.utils.BaseUtils; +import org.springframework.beans.factory.annotation.Autowired; +import com.mdp.form.service.FormViewService; +import com.mdp.form.entity.FormView; +import org.springframework.boot.test.context.SpringBootTest; +/** + * FormViewService的测试案例 + * 组织 com
+ * 顶级模块 mdp
+ * 大模块 form
+ * 小模块
+ * 表 form_view 表单页面
+ * 实体 FormView
+ * 表是指数据库结构中的表,实体是指java类型中的实体类
+ * 当前实体所有属性名:
+ * formId,id,viewContext,bizId;
+ * 当前表的所有字段名:
+ * form_id,id,view_context,biz_id;
+ * 当前主键(包括多主键):
+ * id;
+ ***/ + +@RunWith(SpringJUnit4ClassRunner.class) +@SpringBootTest +public class TestFormViewService { + + @Autowired + FormViewService formViewService; + + /** + * 新增一条数据 + ***/ + @Test + public void insert() { + Map p=BaseUtils.map("formId","c24W","id","rqt3","viewContext","P0zd","bizId","SUTM"); + FormView formView=BaseUtils.fromMap(p,FormView.class); + formViewService.save(formView); + //Assert.assertEquals(1, result); + } + +}