1.修改bug 2.修改小程序修改相关代码

fengjin

2022-10-13 ac31436a8da76a5388ff1700a34ea9247b8ec3d4

1.修改bug 2.修改小程序修改相关代码

 flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java

@@ -174,10 +174,10 @@
        entity.setCreateTime(LocalDateTime.now());
        entity.setUpdateTime(LocalDateTime.now());
        entity.setState("12");
        entity.setDepartmentalId(sysUser.getDepartmentId());
        entity.setToUserId(sysUser.getUserId()+"");
        entity.setFromUserId(order.getGuideUserId());
        entity.setFromDepartmentalId(order.getGuideDepartmentId());
        entity.setDepartmentalId(order.getGuideDepartmentId());
        entity.setToUserId(order.getGuideUserId());
        entity.setFromUserId(sysUser.getUserId()+"");
        entity.setFromDepartmentalId(sysUser.getDepartmentId());
        entity.setGuideId(order.getId().toString());

        iGuideEvolveService.insertConfig(entity);

 flower_city/src/main/java/com/dg/core/db/gen/mapper/TransactionEventMapper.java

@@ -70,7 +70,7 @@
     * @param matterName
     * @return
     */
    List<TransactionEvent> queryMatterNameList(String matterName);
    List<TransactionEvent> queryMatterNameList(@Param("matterName") String matterName,@Param("classifyId") String classifyId);

    /**
     * 导办事务搜索统计数量
@@ -171,5 +171,13 @@
    List<String> selectclassifyId(String classifyId);


    /**
     * 根据关联词导办事务搜索搜索(不分页)(去重用于小程序)
     * @param keyWord
     * @return
     */
    List<Search>  selectSearchAssociateDistinct( String keyWord);



}

 flower_city/src/main/java/com/dg/core/db/manual/pojo/Search.java

@@ -1,8 +1,11 @@
package com.dg.core.db.manual.pojo;

import com.dg.core.db.gen.entity.TransactionEvent;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

@ApiModel("自公告门户网搜索数据")
@Data
@@ -20,6 +23,13 @@
    @ApiModelProperty("浏览次数")
    private  Integer views;

    @ApiModelProperty("分类id")
    private  Integer classifyId;

    @ApiModelProperty("搜索数据类型1.办事部门2.办事指南 3.推荐办事指南4.分类")
    private  Integer type;

    @ApiModelProperty("办事指南")
    private List<TransactionEvent> transactionEventList;

}

 flower_city/src/main/java/com/dg/core/service/impl/TransactionEventImpl.java

@@ -105,8 +105,14 @@
    public QueryResults queryMatterNameList(String keyWord) {
        QueryResults queryResults = new QueryResults();
        List<Search> searches = baseMapper.selectSearchList(keyWord);
        for (Search search:searches) {
            search.setTransactionEventList(baseMapper.queryMatterNameList(keyWord,search.getClassifyId().toString()));
        }
        queryResults.setSearchList(searches);
        List<Search> searchesAssociate = baseMapper.selectSearchAssociate(keyWord);
        List<Search> searchesAssociate = baseMapper.selectSearchAssociateDistinct(keyWord);
        for (Search search:searchesAssociate) {
            search.setTransactionEventList(baseMapper.queryMatterNameList(keyWord,search.getClassifyId().toString()));
        }
        queryResults.setTransactionEventList(searchesAssociate);
        queryResults.setKeywordEntityList( keywordMapper.selectByName(keyWord));
        return queryResults;
@@ -117,7 +123,7 @@
    public RecommendResult smartConsulting(String keyWord){
        RecommendResult recommendResult=new RecommendResult();
        List<KeywordEntity> keywordEntityList=new ArrayList<>();
        List<TransactionEvent> transactionEventEntities = baseMapper.queryMatterNameList(keyWord);
        List<TransactionEvent> transactionEventEntities = baseMapper.queryMatterNameList(keyWord,null);
        recommendResult.setTransactionEventList(transactionEventEntities);
        for (TransactionEvent transactionEvent: transactionEventEntities) {
            if (transactionEvent.getAssociateNames()!=null) {

 flower_city/src/main/resources/mapper/SysUserMapper.xml

@@ -123,7 +123,7 @@
    <select id="selectListByDepartmentId"  resultMap="SysUserResult">
        <include refid="selectSysUserVo"/>
         <where>
             user_type=2 and status=1
             user_type=2 and status=0
        <if test="list!=null">
            and  department_id in
            <foreach collection="list" item="id" index="index" open="(" close=")" separator=",">

 flower_city/src/main/resources/mapper/TransactionEventMapper.xml

@@ -296,6 +296,9 @@
            <if test="matterName != null and matterName != ''">
                AND (matter_name like concat('%', #{matterName}, '%') or #{matterName} like concat('%', matter_name, '%'))
            </if>
            <if test="classifyId != null and classifyId != ''">
               and (classify_id= #{classifyId} or classify_id in (select id FROM automessage_classify_administration where parent_id =#{classifyId} ))
            </if>

        </where>
        order by create_time desc
@@ -357,12 +360,15 @@
    </select>

    <select id="selectSearchList" resultType="com.dg.core.db.manual.pojo.Search">
        select  id,title,content,views, type FROM(
                                                     select  id,organization_name title,resume content,null views,1 type  from   automessage_organization_chart  UNION
                                                     select  id,classify_name title,null content,null views,4 type from  automessage_classify_administration UNION
                                                     select  id,matter_name title,null content,transaction_num views,2 type  from automessage_transaction_event
                                                 ) k
        where  k.title like concat('%',#{keyWord}, '%') or k.content  like concat('%', #{keyWord}, '%')
        select distinct   classify_id, content, type   FROM(
                                                               select id,classify_name title,ifnull(concat((select classify_name from automessage_classify_administration where c.parent_id=id),'/',classify_name),classify_name)  content,id classify_id,4 type  from automessage_classify_administration c UNION

                                                               select  id,matter_name title,concat((select classify_name from  automessage_classify_administration
                                                                                                    where id=(select parent_id from  automessage_classify_administration  where id=automessage_transaction_event.classify_id)),
                                                                                                   '/',(select classify_name from  automessage_classify_administration  where id=automessage_transaction_event.classify_id)) content,classify_id,
                                                                       2 type from automessage_transaction_event
                                                           ) k
        where  k.title like concat('%',#{keyWord}, '%')
    </select>

    <select id="selectSearchAssociate" resultType="com.dg.core.db.manual.pojo.Search">
@@ -372,6 +378,12 @@
        transaction_num views ,3 type from automessage_transaction_event where  associate_names like   concat('%',#{keyWord}, '%')
    </select>

    <select id="selectSearchAssociateDistinct" resultType="com.dg.core.db.manual.pojo.Search" >
             select  distinct   classify_id,
                    (select ifnull(concat((select classify_name from automessage_classify_administration where c.parent_id=id),'/',classify_name),classify_name)  content  from automessage_classify_administration c where c.id=t.classify_id) content,
                    3 type from automessage_transaction_event t where  associate_names like  concat('%',#{keyWord}, '%')
    </select>



    <select id="selectDataIfExist" resultType="string">