Merge branch 'huacheng_test' into haucheng_panzhihua

张天森

2022-10-27 2148e9e1f40388ec2710e54f634906378ded1a33

Merge branch 'huacheng_test' into haucheng_panzhihua

 flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java

@@ -247,8 +247,8 @@
        entity.setCreateTime(LocalDateTime.now());
        entity.setUpdateTime(LocalDateTime.now());
        entity.setState("5");
        entity.setDepartmentalId(sysUser.getDepartmentId());
        entity.setToUserId(sysUser.getUserId()+"");
        entity.setFromDepartmentalId(sysUser.getDepartmentId());
        entity.setFromUserId(sysUser.getUserId()+"");
        entity.setGuideId(order.getId().toString());
        iGuideEvolveService.insertConfig(entity);
        return toAjax(iGuideRepairOrderService.updateConfig(order));

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

@@ -23,6 +23,7 @@

import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;

/**
@@ -387,6 +388,8 @@
//                userId=sysUser.getUserId()+"";
//            }
            userId=sysUser.getUserId()+"";
            ids=new ArrayList<>();
            ids.add(sysUser.getDepartmentId());
        }
        else
        {
@@ -406,19 +409,26 @@
    public ResultData getWorkOrder(@CurrentUser SysUser sysUser)
    {
        WorkOrder workOrder=new WorkOrder();
        List<String> ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        List<String> ids=null;
        String userId=null;
        if( StringUtils.equals("2",sysUser.getRoleIds()))
        {
            if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
            {
                userId=null;
            }
            else
            {
                ids=null;
                userId=sysUser.getUserId()+"";
            }
//            if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
//            {
//                userId=null;
//            }
//            else
//            {
//                ids=null;
//                userId=sysUser.getUserId()+"";
//            }
            userId=sysUser.getUserId()+"";
            ids=new ArrayList<>();
            ids.add(sysUser.getDepartmentId());
        }
        else
        {
            ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        }

        //状态（1待分配  2 待办结 3 已办结 4 待评价 5 已取消  ）

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

@@ -1,6 +1,7 @@
package com.dg.core.db.manual.pojo;

import com.dg.core.db.gen.entity.KeywordEntity;
import com.dg.core.db.gen.entity.OrganizationChartEntity;
import com.dg.core.db.gen.entity.TransactionEvent;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -28,4 +29,7 @@
    @ApiModelProperty("关联联想词列表")
    private  List<KeywordEntity> keywordAssociationList;

    @ApiModelProperty("办事部门列表")
    private  List<OrganizationChartEntity> organizationChartEntityList;

}

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

@@ -241,8 +241,10 @@
                SysUser sysUserTo = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getToUserId()));
                SysUser sysUserFrom = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getFromUserId()));
                sysUserTo.setTransactionNum(sysUserTo.getTransactionNum() + 1);
                sysUserFrom.setTransactionNum(sysUserFrom.getTransactionNum() - 1);
                sysUserMapper.updateById(sysUserFrom);
                if (sysUserFrom.getUserType().equals(2)){
                    sysUserFrom.setTransactionNum(sysUserFrom.getTransactionNum() - 1);
                    sysUserMapper.updateById(sysUserFrom);
                }
                GuideRepairOrder guideRepairOrder = baseMapper.selectOne(new QueryWrapper<GuideRepairOrder>().lambda()
                        .eq(GuideRepairOrder::getId, order.getGuideId()));
                //短信发送
@@ -346,6 +348,19 @@

    @Override
    public int deleteConfigById(String Id) {
        GuideRepairOrder guideRepairOrderDelete = baseMapper.selectOne(new QueryWrapper<GuideRepairOrder>().lambda().eq(GuideRepairOrder::getId, Id));
        //删除进展记录
        guideEvolveMapper.delete(new QueryWrapper<GuideEvolveEntity>().lambda().eq(GuideEvolveEntity::getGuideId, Id));
        TransactionEvent transactionEvent = transactionEventMapper.selectOne(new QueryWrapper<TransactionEvent>().lambda().eq(TransactionEvent::getId, guideRepairOrderDelete.getMatterId()));
        transactionEvent.setTransactionNum(transactionEvent.getTransactionNum()-1);
        //对应办事指南减一
        transactionEventMapper.updateById(transactionEvent);
        SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, guideRepairOrderDelete.getGuideUserId()));
        if (sysUser!=null){
            //对应导半人员待导半数量建议
            sysUser.setTransactionNum(sysUser.getTransactionNum()-1);
            sysUserMapper.updateById(sysUser);
        }
        return baseMapper.deleteConfigById(Id);
    }


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

@@ -136,6 +136,7 @@
        for (Search search : searches) {
            search.setTransactionEventList(baseMapper.queryMatterNameList(keyWord, search.getClassifyId().toString()));
        }
        queryResults.setOrganizationChartEntityList(organizationChartMapper.selectByKeyWord(keyWord));
        queryResults.setSearchList(searches);
        List<Search> searchesAssociate = baseMapper.selectSearchAssociateDistinct(keyWord);
        for (Search search : searchesAssociate) {

 flower_city/src/main/java/com/dg/core/util/PermissionUtil.java

@@ -46,7 +46,8 @@
        else if(StringUtils.equals("1", sysUser.getUserType()))
        {
            //管理员
            List<String> ids=iOrganizationChartService.getIds("");
//            List<String> ids=iOrganizationChartService.getIds("");
            List<String> ids=null;
            return ids;
        }
        else

 flower_city/src/main/resources/application.properties

@@ -1,8 +1,6 @@
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.username=root
spring.datasource.password=nahanMysqlPwd&&RemoteRemote2019nahan
#spring.datasource.url=jdbc:mysql://10.8.0.74:3306/flower_city_automessage?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&allowMultiQueries=true&serverTimezone=GMT%2B8
#spring.datasource.url=jdbc:mysql://localhost:3306/flower_city_automessage?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&allowMultiQueries=true&serverTimezone=GMT%2B8
#spring.datasource.url=jdbc:mysql://10.8.0.74:3306/huacheng_smart_life?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&allowMultiQueries=true&serverTimezone=GMT%2B8
spring.datasource.url=jdbc:mysql://182.151.2.19:3306/huacheng_smart_life?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8


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

@@ -52,7 +52,7 @@
                select classify_id from  automessage_transaction_event where department_id=#{departmentId} UNION
                select parent_id from  automessage_classify_administration
                where id in (select classify_id FROM automessage_transaction_event
                where department_id=#{departmentId}))
                where department_id in (select id from automessage_organization_chart where id=#{departmentId}  or parent_id=#{departmentId}))  )
            </if>
        </where>
    </select>

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

@@ -82,6 +82,15 @@
    <select id="selectConfigList"  resultMap="GuideRepairOrderResult">
        <include refid="selectGuideRepairOrderVo"/>
        <where>
            <if test="ids != null">
                and guide_department_id IN
                <foreach collection="ids" item="param"  open="(" close=")" separator=",">
                    #{param}
                </foreach>
            </if>
            <if test="guideUserId != null and guideUserId != ''">
                AND a.guide_user_id=#{guideUserId}
            </if>
            <if test="matterName != null and matterName != ''">
                AND (matter_name like concat('%', #{matterName}, '%')) or
                ( classify_id in ( SELECT id FROM automessage_classify_administration WHERE classify_name like concat('%', #{matterName}, '%') ) )
@@ -96,15 +105,6 @@
            <if test="status != null and status != ''">
                AND a.state=#{status}
            </if>
            <if test="ids != null">
                and department_id IN
                <foreach collection="ids" item="param"  open="(" close=")" separator=",">
                    #{param}
                </foreach>
            </if>
            <if test="guideUserId != null and guideUserId != ''">
                AND a.guide_user_id=#{guideUserId}
            </if>
        </where>
        order by  update_time desc ,  create_time desc
    </select>
@@ -112,6 +112,15 @@
    <select id="countConfigList"  resultType="integer">
        select count(id) from automessage_guide_repair_order
        <where>
            <if test="ids != null">
                and guide_department_id IN
                <foreach collection="ids" item="param"  open="(" close=")" separator=",">
                    #{param}
                </foreach>
            </if>
            <if test="guideUserId != null and guideUserId != ''">
                AND automessage_guide_repair_order.guide_user_id=#{guideUserId}
            </if>
            <if test="matterName != null and matterName != ''">
                AND (matter_name like concat('%', #{matterName}, '%')) or
                ( classify_id in ( SELECT id FROM automessage_classify_administration WHERE classify_name like concat('%', #{matterName}, '%') ) )
@@ -126,15 +135,7 @@
            <if test="status != null and status != ''">
                AND automessage_guide_repair_order.state=#{status}
            </if>
            <if test="ids != null">
                and department_id IN
                <foreach collection="ids" item="param"  open="(" close=")" separator=",">
                    #{param}
                </foreach>
            </if>
            <if test="guideUserId != null and guideUserId != ''">
                AND automessage_guide_repair_order.guide_user_id=#{guideUserId}
            </if>

        </where>
    </select>

@@ -218,7 +219,7 @@
                AND guide_user_id=#{guideUserId}
            </if>
            <if test="ids != null">
                and department_id IN
                and guide_department_id IN
                <foreach collection="ids" item="param"  open="(" close=")" separator=",">
                    #{param}
                </foreach>
@@ -254,7 +255,7 @@
                automessage_guide_repair_order.state=#{state}
            </if>
            <if test="ids != null">
                and department_id IN
                and guide_department_id IN
                <foreach collection="ids" item="param"  open="(" close=")" separator=",">
                    #{param}
                </foreach>

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

@@ -98,7 +98,8 @@
            (select user_name from automessage_sys_user where automessage_sys_user.user_id=create_by) as createName,
            transaction_num,
            (select count(id) from automessage_guide_repair_order where automessage_guide_repair_order.state='3'
             and automessage_guide_repair_order.guide_user_id=user_id) as transactionEndNum,
             and automessage_guide_repair_order.guide_user_id=user_id and
             automessage_guide_repair_order.guide_department_id=automessage_sys_user.department_id) as transactionEndNum,
            (select role_name from automessage_role_management where automessage_role_management.id=role_ids) as roleName,
            (select permission from automessage_role_management where automessage_role_management.id=role_ids) as permission,
            (select organization_name from automessage_organization_chart where automessage_sys_user.department_id=automessage_organization_chart.id) as department_name

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

@@ -393,7 +393,7 @@
        <include refid="selectTransactionEventEntityVo"/>
        where  (classify_id= #{classifyId} or classify_id in (select id FROM automessage_classify_administration where parent_id =#{classifyId} ))
        <if test="departmentId!=null">
            and   department_id=#{departmentId}
            and  department_id in (select id from automessage_organization_chart where id=#{departmentId}  or parent_id=#{departmentId})
        </if>
        order by create_time desc
    </select>
@@ -435,7 +435,7 @@
                 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,
                         transaction_num views,2 type from automessage_transaction_event
                         browse_num views,2 type from automessage_transaction_event
             ) k
        where  k.title like concat('%',#{keyWord}, '%') or k.content  like concat('%', #{keyWord}, '%')
    </select>
@@ -452,7 +452,7 @@
       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,
        transaction_num views ,3 type from automessage_transaction_event where  associate_names like   concat('%',#{keyWord}, '%')
               browse_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" >

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

@@ -41,6 +41,7 @@
import org.springframework.web.bind.annotation.RequestParam;

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.*;

import static java.util.Objects.isNull;
@@ -1059,7 +1060,12 @@
        if (nonNull(vo.getSuccess()) && !vo.getSuccess().equals(0)){
            if (nonNull(vo.getAccepted()) && !vo.getAccepted().equals(0)){
                //计算成功率
                vo.setSuccessRate(NumberUtil.div(vo.getSuccess(),vo.getAccepted(),2));
                try {
                    vo.setSuccessRate(NumberUtil.div(vo.getSuccess(),vo.getAccepted(),2));
                }catch (NullPointerException e){
                    vo.setSuccessRate(new BigDecimal(0));
                }

            }
        }
        vo.setExpert(comSanshuoExpertDao.selectExpertCount(indexDataDTO));