java/zhihuishenqu.git

parent: dd959e56 | 补丁 | 提交 | show whitespace

huanghongfa

2021-01-14 80e3030281b8909de7ca060b1cd3869dbbca282e

社区后台微心愿查询修改为模糊查询

2个文件已修改

	springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml

@@ -24,7 +24,7 @@
  <component name="ChangeListManager">
    <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -390,7 +390,7 @@
      <workItem from="1610326930387" duration="5497000" />
      <workItem from="1610368400707" duration="771000" />
      <workItem from="1610415637750" duration="6485000" />
      <workItem from="1610499071420" duration="20138000" />
      <workItem from="1610499071420" duration="21465000" />
    </task>
    <servers />
  </component>
@@ -510,10 +510,10 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1609226181026" />
    <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1610592858117">
    <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1610600693042">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1610592858117" />
    <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1610600693042" />
    <state width="600" height="428" key="javadoc.popup" timestamp="1610005781618">
      <screen x="0" y="0" width="1536" height="824" />
    </state>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java

@@ -47,18 +47,21 @@
            "left join com_act_micro_wish_user wu on w.id=wu.micro_wish_id "+
            "JOIN sys_user u ON w.sponsor_id = u.user_id \n" +
            "<if test='comActMicroWishVO.sponsorName != null and comActMicroWishVO.sponsorName.trim() != &quot;&quot;'>" +
            "AND u.name = #{comActMicroWishVO.sponsorName} \n" +
            "AND u.name like concat(#{comActMicroWishVO.sponsorName},'%')  \n" +
            " JOIN sys_user su ON w.responsible_id = su.user_id \n" +
            " </if> " +
            "<if test='comActMicroWishVO.sponsorName == null or comActMicroWishVO.sponsorName.trim() == &quot;&quot;'>" +
            "LEFT JOIN sys_user su ON w.responsible_id = su.user_id \n" +
            " </if> " +
            "<if test='comActMicroWishVO.responsibleName != null and comActMicroWishVO.responsibleName.trim() != &quot;&quot;'>" +
            "AND su.`name` = #{comActMicroWishVO.responsibleName} \n" +
            "AND su.`name` like concat(#{comActMicroWishVO.responsibleName},'%')  \n" +
            " </if> " +
            "where w.status!=3 " +
            "<if test='comActMicroWishVO.communityId != null and comActMicroWishVO.communityId != 0'>" +
            " and w.community_id=#{comActMicroWishVO.communityId} \n" +
            " </if> " +
            "<if test='comActMicroWishVO.sponsorPhone != null and comActMicroWishVO.sponsorPhone.trim() != &quot;&quot;'>" +
            "AND w.sponsor_phone = #{comActMicroWishVO.sponsorPhone} \n" +
            "AND w.sponsor_phone like concat(#{comActMicroWishVO.sponsorPhone},'%')  \n" +
            " </if> " +
            "<if test='comActMicroWishVO.status != null and comActMicroWishVO.status!=0 '>" +
            "AND w.`status` = #{comActMicroWishVO.status} \n" +
@@ -102,11 +105,14 @@
            "left join com_act_micro_wish_user wu on w.id=wu.micro_wish_id "+
            "JOIN sys_user u ON w.sponsor_id = u.user_id \n" +
            "<if test='comActMicroWishVO.sponsorName != null and comActMicroWishVO.sponsorName.trim() != &quot;&quot;'>" +
            "AND u.name = #{comActMicroWishVO.sponsorName} \n" +
            "AND u.name like concat(#{comActMicroWishVO.sponsorName},'%')  \n" +
            " JOIN sys_user su ON w.responsible_id = su.user_id \n" +
            " </if> " +
            "<if test='comActMicroWishVO.sponsorName == null or comActMicroWishVO.sponsorName.trim() == &quot;&quot;'>" +
            "LEFT JOIN sys_user su ON w.responsible_id = su.user_id \n" +
            " </if> " +
            "<if test='comActMicroWishVO.responsibleName != null and comActMicroWishVO.responsibleName.trim() != &quot;&quot;'>" +
            "AND su.`name` = #{comActMicroWishVO.responsibleName} \n" +
            "AND su.`name` like concat(#{comActMicroWishVO.responsibleName},'%')  \n" +
            " </if> " +
            "where w.status=3 and w.form=1 \n" +
            "<if test='comActMicroWishVO.backUserId != null and comActMicroWishVO.backUserId != 0'>" +
@@ -116,7 +122,7 @@
            " and w.community_id=#{comActMicroWishVO.communityId} \n" +
            " </if> " +
            "<if test='comActMicroWishVO.sponsorPhone != null and comActMicroWishVO.sponsorPhone.trim() != &quot;&quot;'>" +
            "AND w.sponsor_phone = #{comActMicroWishVO.sponsorPhone} \n" +
            "AND w.sponsor_phone like concat(#{comActMicroWishVO.sponsorPhone},'%')  \n" +
            " </if> " +
            "<if test='comActMicroWishVO.status != null and comActMicroWishVO.status!=0 '>" +
            "AND w.`status` = #{comActMicroWishVO.status} \n" +

			@@ -24,7 +24,7 @@
			<component name="ChangeListManager">
			<list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
			<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java" afterDir="false" />
			<change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java" afterDir="false" />
			</list>
			<option name="SHOW_DIALOG" value="false" />
			<option name="HIGHLIGHT_CONFLICTS" value="true" />
			@@ -390,7 +390,7 @@
			<workItem from="1610326930387" duration="5497000" />
			<workItem from="1610368400707" duration="771000" />
			<workItem from="1610415637750" duration="6485000" />
			<workItem from="1610499071420" duration="20138000" />
			<workItem from="1610499071420" duration="21465000" />
			</task>
			<servers />
			</component>
			@@ -510,10 +510,10 @@
			<screen x="0" y="0" width="1536" height="824" />
			</state>
			<state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1609226181026" />
			<state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1610592858117">
			<state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1610600693042">
			<screen x="0" y="0" width="1536" height="824" />
			</state>
			<state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1610592858117" />
			<state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1610600693042" />
			<state width="600" height="428" key="javadoc.popup" timestamp="1610005781618">
			<screen x="0" y="0" width="1536" height="824" />
			</state>

			@@ -47,18 +47,21 @@
			"left join com_act_micro_wish_user wu on w.id=wu.micro_wish_id "+
			"JOIN sys_user u ON w.sponsor_id = u.user_id \n" +
			"<if test='comActMicroWishVO.sponsorName != null and comActMicroWishVO.sponsorName.trim() != ""'>" +
			"AND u.name = #{comActMicroWishVO.sponsorName} \n" +
			"AND u.name like concat(#{comActMicroWishVO.sponsorName},'%') \n" +
			" JOIN sys_user su ON w.responsible_id = su.user_id \n" +
			" </if> " +
			"<if test='comActMicroWishVO.sponsorName == null or comActMicroWishVO.sponsorName.trim() == ""'>" +
			"LEFT JOIN sys_user su ON w.responsible_id = su.user_id \n" +
			" </if> " +
			"<if test='comActMicroWishVO.responsibleName != null and comActMicroWishVO.responsibleName.trim() != ""'>" +
			"AND su.`name` = #{comActMicroWishVO.responsibleName} \n" +
			"AND su.`name` like concat(#{comActMicroWishVO.responsibleName},'%') \n" +
			" </if> " +
			"where w.status!=3 " +
			"<if test='comActMicroWishVO.communityId != null and comActMicroWishVO.communityId != 0'>" +
			" and w.community_id=#{comActMicroWishVO.communityId} \n" +
			" </if> " +
			"<if test='comActMicroWishVO.sponsorPhone != null and comActMicroWishVO.sponsorPhone.trim() != ""'>" +
			"AND w.sponsor_phone = #{comActMicroWishVO.sponsorPhone} \n" +
			"AND w.sponsor_phone like concat(#{comActMicroWishVO.sponsorPhone},'%') \n" +
			" </if> " +
			"<if test='comActMicroWishVO.status != null and comActMicroWishVO.status!=0 '>" +
			"AND w.`status` = #{comActMicroWishVO.status} \n" +
			@@ -102,11 +105,14 @@
			"left join com_act_micro_wish_user wu on w.id=wu.micro_wish_id "+
			"JOIN sys_user u ON w.sponsor_id = u.user_id \n" +
			"<if test='comActMicroWishVO.sponsorName != null and comActMicroWishVO.sponsorName.trim() != ""'>" +
			"AND u.name = #{comActMicroWishVO.sponsorName} \n" +
			"AND u.name like concat(#{comActMicroWishVO.sponsorName},'%') \n" +
			" JOIN sys_user su ON w.responsible_id = su.user_id \n" +
			" </if> " +
			"<if test='comActMicroWishVO.sponsorName == null or comActMicroWishVO.sponsorName.trim() == ""'>" +
			"LEFT JOIN sys_user su ON w.responsible_id = su.user_id \n" +
			" </if> " +
			"<if test='comActMicroWishVO.responsibleName != null and comActMicroWishVO.responsibleName.trim() != ""'>" +
			"AND su.`name` = #{comActMicroWishVO.responsibleName} \n" +
			"AND su.`name` like concat(#{comActMicroWishVO.responsibleName},'%') \n" +
			" </if> " +
			"where w.status=3 and w.form=1 \n" +
			"<if test='comActMicroWishVO.backUserId != null and comActMicroWishVO.backUserId != 0'>" +
			@@ -116,7 +122,7 @@
			" and w.community_id=#{comActMicroWishVO.communityId} \n" +
			" </if> " +
			"<if test='comActMicroWishVO.sponsorPhone != null and comActMicroWishVO.sponsorPhone.trim() != ""'>" +
			"AND w.sponsor_phone = #{comActMicroWishVO.sponsorPhone} \n" +
			"AND w.sponsor_phone like concat(#{comActMicroWishVO.sponsorPhone},'%') \n" +
			" </if> " +
			"<if test='comActMicroWishVO.status != null and comActMicroWishVO.status!=0 '>" +
			"AND w.`status` = #{comActMicroWishVO.status} \n" +