社区后台微心愿负责人模糊查询

huanghongfa

2021-01-15 15447968a7ac8f93dd321016ad18991e2bcf7908

社区后台微心愿负责人模糊查询

 springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml

@@ -24,10 +24,8 @@
  <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$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishDO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActMicroWishDO.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" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -401,7 +399,7 @@
      <workItem from="1610326930387" duration="5497000" />
      <workItem from="1610368400707" duration="771000" />
      <workItem from="1610415637750" duration="6485000" />
      <workItem from="1610499071420" duration="53444000" />
      <workItem from="1610499071420" duration="55062000" />
    </task>
    <servers />
  </component>
@@ -453,54 +451,54 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1610606590056" />
    <state width="1031" height="544" key="GridCell.Tab.0.bottom" timestamp="1610686481145">
    <state width="1031" height="544" key="GridCell.Tab.0.bottom" timestamp="1610691452226">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610686481145" />
    <state width="1031" height="544" key="GridCell.Tab.0.center" timestamp="1610686481145">
    <state width="1031" height="544" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610691452226" />
    <state width="1031" height="544" key="GridCell.Tab.0.center" timestamp="1610691452226">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1610686481145" />
    <state width="1031" height="544" key="GridCell.Tab.0.left" timestamp="1610686481145">
    <state width="1031" height="544" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1610691452226" />
    <state width="1031" height="544" key="GridCell.Tab.0.left" timestamp="1610691452225">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1610686481145" />
    <state width="1031" height="544" key="GridCell.Tab.0.right" timestamp="1610686481145">
    <state width="1031" height="544" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1610691452225" />
    <state width="1031" height="544" key="GridCell.Tab.0.right" timestamp="1610691452226">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1610686481145" />
    <state width="1031" height="544" key="GridCell.Tab.1.bottom" timestamp="1610686481145">
    <state width="1031" height="544" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1610691452226" />
    <state width="1031" height="544" key="GridCell.Tab.1.bottom" timestamp="1610691452226">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610686481145" />
    <state width="1031" height="544" key="GridCell.Tab.1.center" timestamp="1610686481145">
    <state width="1031" height="544" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610691452226" />
    <state width="1031" height="544" key="GridCell.Tab.1.center" timestamp="1610691452226">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1610686481145" />
    <state width="1031" height="544" key="GridCell.Tab.1.left" timestamp="1610686481145">
    <state width="1031" height="544" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1610691452226" />
    <state width="1031" height="544" key="GridCell.Tab.1.left" timestamp="1610691452226">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1610686481145" />
    <state width="1031" height="544" key="GridCell.Tab.1.right" timestamp="1610686481145">
    <state width="1031" height="544" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1610691452226" />
    <state width="1031" height="544" key="GridCell.Tab.1.right" timestamp="1610691452226">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1610686481145" />
    <state width="1031" height="544" key="GridCell.Tab.2.bottom" timestamp="1610686481146">
    <state width="1031" height="544" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1610691452226" />
    <state width="1031" height="544" key="GridCell.Tab.2.bottom" timestamp="1610691452226">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610686481146" />
    <state width="1031" height="544" key="GridCell.Tab.2.center" timestamp="1610686481146">
    <state width="1031" height="544" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610691452226" />
    <state width="1031" height="544" key="GridCell.Tab.2.center" timestamp="1610691452226">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1610686481146" />
    <state width="1031" height="544" key="GridCell.Tab.2.left" timestamp="1610686481145">
    <state width="1031" height="544" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1610691452226" />
    <state width="1031" height="544" key="GridCell.Tab.2.left" timestamp="1610691452226">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1610686481145" />
    <state width="1031" height="544" key="GridCell.Tab.2.right" timestamp="1610686481146">
    <state width="1031" height="544" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1610691452226" />
    <state width="1031" height="544" key="GridCell.Tab.2.right" timestamp="1610691452226">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1610686481146" />
    <state width="1031" height="544" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1610691452226" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610611848124">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -521,10 +519,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="1610685985967" />
    <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1610689720475">
    <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1610690846090">
      <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="1610689720475" />
    <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1610690846090" />
    <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

@@ -48,12 +48,12 @@
            "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 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;'>" +
            "<if test='comActMicroWishVO.responsibleName == null or comActMicroWishVO.responsibleName.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;'>" +
            " JOIN sys_user su ON w.responsible_id = su.user_id \n" +
            "AND su.`name` like concat(#{comActMicroWishVO.responsibleName},'%')  \n" +
            " </if> " +
            "where w.status!=3 " +
@@ -106,12 +106,12 @@
            "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 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;'>" +
            "<if test='comActMicroWishVO.responsibleName == null or comActMicroWishVO.responsibleName.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;'>" +
            " JOIN sys_user su ON w.responsible_id = su.user_id \n" +
            "AND su.`name` like concat(#{comActMicroWishVO.responsibleName},'%')  \n" +
            " </if> " +
            "where w.status=3 and w.form=1 \n" +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActMicroWishServiceImpl.java

@@ -131,7 +131,7 @@
                break;
            case 4:
                comActMicroWishDO.setDistributionAt(date);
                comActMicroWishDO.setResponsibleId(null);
                comActMicroWishDO.setResponsibleId(responsibleId);
                comActMicroWishDO.setStatus(5);//待确认
                comActMicroWishDO.setForm(2);
                break;