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

张天森

2022-11-16 fdc1bd4ed5a1aced99556bed3bd27843eae6559c

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

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

@@ -56,9 +56,9 @@
        Assert.notNull(pageSize, "pageSize can not be empty");
        Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
        List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword,ids);
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword,ids,null);

        int num=IUserService.selectNum("2",keyword,ids);
        int num=IUserService.selectNum("2",keyword,ids,null);
        return getDataTable(list,num);
    }

@@ -122,7 +122,7 @@
                user.setRoleIds("2");
            }
            user.setUserType("2");
            user.setIsDivisionHead("1");
            user.setIsDivisionHead(config.getIsDivisionHead());
            user.setStatus(config.getStatus());
            user.setUpdateTime(LocalDateTime.now());
            //提示用户名或密码错误
@@ -140,7 +140,7 @@
        config.setCreateTime(LocalDateTime.now());
        config.setUpdateTime(LocalDateTime.now());
        config.setUserId(Snowflake.getId()+"");
        config.setIsDivisionHead("1");
        config.setIsDivisionHead(config.getIsDivisionHead());
        return toAjax(IUserService.insertConfig(config));
    }


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

@@ -162,11 +162,37 @@
    }




    /**
     * 通过父级id查询对应机构下的全部部门id
     * @param departmentId
     * @return
     */
    @ApiOperation(value = "通过父级id查询对应机构下的全部部门")
    @GetMapping("/getdepartment/id")
    public TableDataInfo getOrganizationIds(@RequestParam(value = "department",required = false) String departmentId)
    {
        if(StringUtils.isEmpty(departmentId))
        {
            return getDataTable("departmentId 不能为空");
        }

        List<String> ids=new ArrayList<>();
        List<String> getId=iOrganizationChartService.getIds(departmentId);
        ids.addAll(getId);
        return getDataTable(ids);
    }





    /**
     * 通过父级id查询对应机构下的全部部门
     * @param departmentId
     * @return
     */
    @ApiOperation(value = "通过父级id查询对应机构下的全部部门",response = OrganizationChartEntity.class)
    @GetMapping("/getdepartment")
    public TableDataInfo getOrganizations(@RequestParam(value = "department",required = false) String departmentId)

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

@@ -195,9 +195,9 @@
        Assert.notNull(pageNum, "pageNum can not be empty");
        Assert.notNull(pageSize, "pageSize can not be empty");
        Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3",keyword,null);
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3",keyword,null,"1");

        int num=IUserService.selectNum("3",keyword,null);
        int num=IUserService.selectNum("3",keyword,null,"1");
        return getDataTable(list,num);
    }


 flower_city/src/main/java/com/dg/core/db/gen/entity/GuideEvolveEntity.java

@@ -54,9 +54,9 @@
    private String fromUserId;

    /**
     * state", value = "状态（1待分配  2 待办结 3 已办结 4 待评价 5 已取消 6未解决  7已解决  8 系统自动分配 9 回复 10转派 11手动分配12默认好评13评价）
     * state", value = "状态（1待分配  2 待办结 3 已办结 4 待评价 5 已取消 6未解决  7已解决  8 系统自动分配 9 回复 10转派 11手动分配12默认好评13评价14.删除评论）
     */
    @ApiModelProperty(name = "state", value = "状态（1待分配  2 待办结 3 已办结 4 待评价 5 已取消 6未解决  7已解决  8 系统自动分配 9 回复 10转派 11手动分配 12默认好评 13用户评价）")
    @ApiModelProperty(name = "state", value = "状态（1待分配  2 待办结 3 已办结 4 待评价 5 已取消 6未解决  7已解决  8 系统自动分配 9 回复 10转派 11手动分配 12默认好评 13用户评价14.删除评论）")
    private String state;



 flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java

@@ -194,6 +194,12 @@
    @ApiModelProperty("是否推送过（1 是 2 否）")
    private Integer isPush;

    /**
     * 是否隐藏评论（1 是 2 否）
     */
    @ApiModelProperty("是否隐藏评论（1 是 2 否）")
    private Integer isHideComments;

    @TableField(exist = false)
    @ApiModelProperty(name = "sumClassifyName", value = "完整分类名称")
    private String sumClassifyName;

 flower_city/src/main/java/com/dg/core/db/gen/entity/TransactionEvent.java

@@ -201,7 +201,7 @@
    @ApiModelProperty("操作指引附件url")
    private String operationalGuidelineUrl;

   /**
    /**
     * 操作指引视频url
     */
    @ApiModelProperty("操作指引视频url")
@@ -273,4 +273,12 @@
    @ApiModelProperty(name = "classifyIds", value = "前端使用")
    private String classifyIds;


    @ApiModelProperty(name = "departmentIds", value = "所属部门列")
    private String departmentIds;

    @TableField(exist = false)
    @ApiModelProperty(name = "departmentNames", value = "所属部门列名称集合")
    private String departmentNames;

}

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

@@ -29,7 +29,8 @@
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,
                                          @Param("userType") String userType,
                                          @Param("userName") String userName,
                                          @Param("ids") List<String> ids);
                                          @Param("ids") List<String> ids,
                                          @Param("isDivisionHead") String  isDivisionHead);



@@ -70,7 +71,8 @@
     */
    public int selectNum(@Param("userType") String userType,
                         @Param("userName") String userName,
                         @Param("ids") List<String> ids);
                         @Param("ids") List<String> ids,
                         @Param("isDivisionHead") String  isDivisionHead);

    /**
     * 根据部门id及分类id获取导办用户

 flower_city/src/main/java/com/dg/core/service/IGuideRepairOrderService.java

@@ -133,4 +133,11 @@
     */
    int updateEvaluate();


    /**
     * 删除评论
     * @return
     */
    int deleteComment(Integer id);

}

 flower_city/src/main/java/com/dg/core/service/ISysUserService.java

@@ -15,7 +15,7 @@
     * @return 参数配置信息
     */
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,
                                          String userName,List<String> ids);
                                          String userName,List<String> ids,String isDivisionHead);


    SysUser selectData(String userId,String phonenumber,String loginName);
@@ -49,7 +49,7 @@
     *
     * @return 结果
     */
    public int selectNum(String userType,String userName,List<String> ids);
    public int selectNum(String userType,String userName,List<String> ids,String  isDivisionHead);

    /**
     * 发送验证码(如果没有该用户则新建用户)

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

@@ -437,5 +437,21 @@
        return 0;
    }

    @Override
    public int deleteComment(Integer id) {
        GuideRepairOrder guideRepairOrder = baseMapper.selectOne(new QueryWrapper<GuideRepairOrder>().lambda().eq(GuideRepairOrder::getId, id));
        guideRepairOrder.setIsHideComments(1);
        baseMapper.updateById(guideRepairOrder);
        //新增删除评论进展
        GuideEvolveEntity entity = new GuideEvolveEntity();
        entity.setCreateTime(LocalDateTime.now());
        entity.setUpdateTime(LocalDateTime.now());
        entity.setState("14");
        entity.setFromUserId(guideRepairOrder.getSubmitUserId() + "");
        entity.setGuideId(guideRepairOrder.getId().toString());
        guideEvolveMapper.insertConfig(entity);
        return  baseMapper.updateById(guideRepairOrder);
    }


}

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

@@ -254,8 +254,8 @@
    }

    @Override
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,String userName,List<String> ids) {
        return baseMapper.selectConfigList(page, state,userType,userName,ids);
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,String userName,List<String> ids,String isDivisionHead) {
        return baseMapper.selectConfigList(page, state,userType,userName,ids,isDivisionHead);
    }

    @Override
@@ -298,8 +298,8 @@
    }

    @Override
    public int selectNum(String userType,String userName,List<String> ids) {
        return baseMapper.selectNum(userType,userName,ids);
    public int selectNum(String userType,String userName,List<String> ids,String  isDivisionHead) {
        return baseMapper.selectNum(userType,userName,ids,isDivisionHead);
    }



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

@@ -119,6 +119,9 @@
                    #{param}
                </foreach>
            </if>
            <if test="isDivisionHead != null and isDivisionHead != ''">
                AND is_division_head=#{isDivisionHead}
            </if>
            <if test="userName != null and userName != ''">
                AND (user_name like concat('%', #{userName}, '%') or
                (department_id in (SELECT id FROM automessage_organization_chart
@@ -152,6 +155,9 @@
                    #{param}
                </foreach>
            </if>
            <if test="isDivisionHead != null and isDivisionHead != ''">
                and is_division_head=#{isDivisionHead}
            </if>
            <if test="userName != null and userName != ''">
                AND (user_name like concat('%', #{userName}, '%') or
                (department_id in (SELECT id FROM automessage_organization_chart

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

@@ -48,6 +48,7 @@
        <id     property="transactionAreaUrl"      column="transaction_area_url"      />
        <id     property="transactionAreaName"      column="transaction_area_name"      />
        <id     property="classifyIds"      column="classify_ids"      />
        <id     property="departmentIds"      column="department_ids"      />

    </resultMap>

@@ -102,6 +103,13 @@
            transaction_area_url,
            transaction_area_name,
            classify_ids,
            department_ids,
            (SELECT GROUP_CONCAT(organization_name) FROM automessage_organization_chart WHERE id in (SELECT
                 substring_index(substring_index(department_ids,',', b.help_topic_id + 1), ',', -1) result
             FROM
                 mysql.help_topic b
             where
                     b.help_topic_id &lt; (LENGTH(department_ids) - LENGTH(REPLACE(department_ids, ',', '')) + 1))) as departmentNames,
            (IF((select classify_grade from automessage_classify_administration where automessage_classify_administration.id=automessage_transaction_event.classify_id)='2',
                (select classify_name from automessage_classify_administration where automessage_classify_administration.id=(select parent_id from
                automessage_classify_administration where automessage_classify_administration.id=automessage_transaction_event.classify_id)),
@@ -138,6 +146,13 @@
            associate_names,
            transaction_num,
            browse_num,
            department_ids,
            (SELECT GROUP_CONCAT(organization_name) FROM automessage_organization_chart WHERE id in (SELECT
              substring_index(substring_index(department_ids,',', b.help_topic_id + 1), ',', -1) result
          FROM
              mysql.help_topic b
          where
                  b.help_topic_id &lt; (LENGTH(department_ids) - LENGTH(REPLACE(department_ids, ',', '')) + 1))) as departmentNames,
            create_time,
            update_time
        FROM
@@ -239,6 +254,7 @@
        <if test="transactionAreaUrl != null ">transaction_area_url,</if>
        <if test="transactionAreaName != null ">transaction_area_name,</if>
        <if test="classifyIds != null ">classify_ids,</if>
        <if test="departmentIds != null ">department_ids,</if>
        update_time,
        create_time
        )values(
@@ -281,6 +297,7 @@
        <if test="transactionAreaUrl != null ">#{transactionAreaUrl},</if>
        <if test="transactionAreaName != null ">#{transactionAreaName},</if>
        <if test="classifyIds != null ">#{classifyIds},</if>
        <if test="departmentIds != null ">#{departmentIds},</if>
        sysdate(),
        sysdate()
        )
@@ -328,6 +345,7 @@
            <if test="transactionAreaUrl != null ">transaction_area_url=#{transactionAreaUrl},</if>
            <if test="transactionAreaName != null ">transaction_area_name=#{transactionAreaName},</if>
            <if test="classifyIds != null ">classify_ids=#{classifyIds},</if>
            <if test="departmentIds != null ">department_ids=#{departmentIds},</if>
            update_time=sysdate()
        </set>
        where  id= #{id}