Procházet zdrojové kódy

流程节点完善

guarantee-lsq před 9 měsíci
rodič
revize
bfac898d49

+ 2 - 24
platform-dao/src/main/resources/mapper/custom/CustomFormMapper.xml

@@ -1,28 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.platform.dao.mapper.custom.CustomFormMapper">
-    <sql id="Base_Column_List">
-                             form.id,
-                                     form.type,
-                                     form.json_string,
-                                     form.flow_id,
-                                     form.remark,
-                                     form.created_user_id,
-                                     form.created_user_name,
-                                     form.created_time,
-                                     form.update_user_id,
-                                     form.update_user_name,
-                                     form.update_time
-                        </sql>
-    <sql id="Ref_Column_List">
-        form
-        .
-        type
-        ,
-                                     form.json_string,
-                                     form.flow_id,
-                                     form.remark,
-    </sql>
     <sql id="List_Condition">
         <if test="id != null and id != ''">
             and form.id = #{id}
@@ -69,8 +47,8 @@
         <if test="updateTime != null">
             and form.update_time = #{updateTime}
         </if>
-        <if test="keyword != null and keyword != ''">
-            and form.id like concat(concat('%',#{keyword}),'%')
+        <if test="name != null and name != ''">
+            and form.name like concat(concat('%',#{name}),'%')
         </if>
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.custom.CustomFormDTO" resultType="com.platform.dao.vo.query.custom.CustomFormVO">

+ 3 - 0
platform-service/src/main/java/com/platform/service/custom/impl/CustomFormServiceImpl.java

@@ -61,6 +61,9 @@ public class CustomFormServiceImpl extends BaseServiceImpl<CustomFormMapper, Cus
     @Override
     public AbstractPageResultBean<CustomFormVO> selectPageList(CustomFormDTO record, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
+        if(StringUtils.isNotBlank(record.getName())){
+            record.setName(record.getName().trim());
+        }
         return new MyPage(mapper.selectList(record));
     }