Merge remote-tracking branch 'origin/demo_' into demo_

platform-dao/src/main/java/com/platform/dao/entity/spareAdd/LongYanSpareAdd.java

@@ -22,11 +22,10 @@ import javax.persistence.Transient;
 @Table(name = "t_long_yan_spare_add")
 public class LongYanSpareAdd implements Serializable{
     private Integer tokenType;//1:新厂，2：老厂
-
     /**
      *
      */
-        @Id
+    @Id
     private String id;
     /**
      * 存货分类

platform-dao/src/main/resources/mapper/spareAdd/LongYanSpareAddMapper.xml

@@ -27,69 +27,70 @@
                                      menu.status,
                                                                                                                                                                                                                                                                                                 </sql>
     <sql id="List_Condition">
-                                    <if test="id != null and id != ''">
-                    and menu.id = #{id}
-                </if>
-                                                <if test="category != null and category != ''">
-                    and menu.category = #{category}
-                </if>
-                                                <if test="bigCategory != null and bigCategory != ''">
-                    and menu.big_category = #{bigCategory}
-                </if>
-                                                <if test="name != null and name != ''">
-                    and menu.name = #{name}
-                </if>
-                                                <if test="ggxh != null and ggxh != ''">
-                    and menu.ggxh = #{ggxh}
-                </if>
-                                                <if test="unit != null and unit != ''">
-                    and menu.unit = #{unit}
-                </if>
-                                                <if test="remark != null and remark != ''">
-                    and menu.remark = #{remark}
-                </if>
-                                                <if test="status != null">
-                    and menu.status = #{status}
-                </if>
-                                                <if test="createdUserId != null and createdUserId != ''">
-                    and menu.created_user_id = #{createdUserId}
-                </if>
-                                                <if test="createdUserName != null and createdUserName != ''">
-                    and menu.created_user_name = #{createdUserName}
-                </if>
-                                                <if test="createdTimeStart != null">
-                    and menu.created_time <![CDATA[>=]]>; #{createdTimeStart}
-                </if>
-                <if test="createdTimeEnd != null">
-                    and menu.created_time <![CDATA[<=]]> #{createdTimeEnd}
-                </if>
-                <if test="createdTime != null">
-                    and menu.created_time = #{createdTime}
-                </if>
-                                                <if test="updateUserId != null and updateUserId != ''">
-                    and menu.update_user_id = #{updateUserId}
-                </if>
-                                                <if test="updateUserName != null and updateUserName != ''">
-                    and menu.update_user_name = #{updateUserName}
-                </if>
-                                                <if test="updateTimeStart != null">
-                    and menu.update_time <![CDATA[>=]]>; #{updateTimeStart}
-                </if>
-                <if test="updateTimeEnd != null">
-                    and menu.update_time <![CDATA[<=]]> #{updateTimeEnd}
-                </if>
-                <if test="updateTime != null">
-                    and menu.update_time = #{updateTime}
-                </if>
-                            <if test="keyword != null and keyword != ''">
+        <if test="id != null and id != ''">
+            and menu.id = #{id}
+        </if>
+        <if test="category != null and category != ''">
+            and menu.category = #{category}
+        </if>
+        <if test="bigCategory != null and bigCategory != ''">
+            and menu.big_category = #{bigCategory}
+        </if>
+        <if test="name != null and name != ''">
+            and menu.name = #{name}
+        </if>
+        <if test="ggxh != null and ggxh != ''">
+            and menu.ggxh = #{ggxh}
+        </if>
+        <if test="unit != null and unit != ''">
+            and menu.unit = #{unit}
+        </if>
+        <if test="remark != null and remark != ''">
+            and menu.remark = #{remark}
+        </if>
+        <if test="status != null">
+            and menu.status = #{status}
+        </if>
+        <if test="createdUserId != null and createdUserId != ''">
+            and menu.created_user_id = #{createdUserId}
+        </if>
+        <if test="createdUserName != null and createdUserName != ''">
+            and menu.created_user_name = #{createdUserName}
+        </if>
+        <if test="createdTimeStart != null">
+            and menu.created_time <![CDATA[>=]]>; #{createdTimeStart}
+        </if>
+        <if test="createdTimeEnd != null">
+            and menu.created_time <![CDATA[<=]]> #{createdTimeEnd}
+        </if>
+        <if test="createdTime != null">
+            and menu.created_time = #{createdTime}
+        </if>
+        <if test="updateUserId != null and updateUserId != ''">
+            and menu.update_user_id = #{updateUserId}
+        </if>
+        <if test="updateUserName != null and updateUserName != ''">
+            and menu.update_user_name = #{updateUserName}
+        </if>
+        <if test="updateTimeStart != null">
+            and menu.update_time <![CDATA[>=]]>; #{updateTimeStart}
+        </if>
+        <if test="updateTimeEnd != null">
+            and menu.update_time <![CDATA[<=]]> #{updateTimeEnd}
+        </if>
+        <if test="updateTime != null">
+            and menu.update_time = #{updateTime}
+        </if>
+        <if test="keyword != null and keyword != ''">
             and menu.id like concat(concat('%',#{keyword}),'%')
         </if>
     </sql>
-    <select id="selectList" parameterType="com.platform.dao.dto.spareAdd.LongYanSpareAddDTO" resultType="com.platform.dao.vo.query.spareAdd.LongYanSpareAddVO">
+    <select id="selectList" parameterType="com.platform.dao.dto.spareAdd.LongYanSpareAddDTO"
+            resultType="com.platform.dao.vo.query.spareAdd.LongYanSpareAddVO">
         select menu.*
-                                                                                                                                                                                                                                                                                                        from t_long_yan_spare_add as menu
-                                                                                                                                                                                                                                                                                                        <where>
-            <include refid="List_Condition" />
+        from t_long_yan_spare_add as menu
+        <where>
+            <include refid="List_Condition"/>
         </where>
     </select>
 </mapper>