Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

fengjin

2022-10-19 2175b7b926dedda647c4c5a6744e160d6ee2a588

Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test

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

@@ -47,9 +47,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,"2");
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"2",null);

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

@@ -197,7 +197,8 @@
    @GetMapping("/selectListByDepartmentId")
    @Authorization
    public ResultData selectListByDepartmentId(@RequestParam("departmentId") String departmentId,
                                               @RequestParam(value = "classifyId",required = false) String classifyId){
                                               @RequestParam(value = "classifyId",required = false) String classifyId)
    {
        return  ResultData.success(IUserService.selectListByDepartmentId(departmentId,classifyId));
    }


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

@@ -239,4 +239,30 @@
    }


    /**
     * 办事指南复制
     * @return
     */
    @ApiOperation(value = "办事指南复制",response = ResultData.class)
    @GetMapping("/copy")
    public ResultData copy(@RequestParam("Id") String Id)
    {
        if(StringUtils.isEmpty(Id))
        {
            return ResultData.error("Id不能为空");
        }

        TransactionEvent transactionEvent=iTransactionEventService.selectConfigData(Id,null);
        if(transactionEvent==null)
        {
            return ResultData.error("复制项不存在");
        }
        transactionEvent.setId(null);
        return toAjax(iTransactionEventService.insertConfig(transactionEvent));
    }





}

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

@@ -170,14 +170,15 @@
    @GetMapping("/getlist")
    @Authorization
    public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
                                          @RequestParam(value = "pageSize",required = false) Integer pageSize)
                                          @RequestParam(value = "pageSize",required = false) Integer pageSize,
                                          @RequestParam(value = "userName",required = false) String userName)
    {
        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");
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3",userName);

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


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

@@ -96,15 +96,15 @@
    private String basicInformation;

    /**
     * 受理条件
     * 现场申报
     */
    @ApiModelProperty("受理条件")
    @ApiModelProperty("现场申报")
    private String acceptConditions;

    /**
     * 申请材料
     *  办理区域
     */
    @ApiModelProperty("申请材料")
    @ApiModelProperty("办理区域")
    private String applicationMaterial;

    /**
@@ -114,9 +114,9 @@
    private String handlingProcedures;

    /**
     * 收费标准
     * 网上申报
     */
    @ApiModelProperty("收费标准")
    @ApiModelProperty("网上申报")
    private String rates;

    /**
@@ -132,7 +132,6 @@
    @ApiModelProperty("更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime updateTime;


    /**
     * 联想词内容 , 连接
@@ -151,14 +150,14 @@
    @ApiModelProperty("基础信息附件url")
    private String basicInformationUrl;
    /**
     * 受理条件附件url
     * 现场申报附件url
     */
    @ApiModelProperty("受理条件附件url")
    @ApiModelProperty("现场申报附件url")
    private String acceptConditionsUrl;
    /**
     * 申请材料附件url
     * 办理区域附件url
     */
    @ApiModelProperty("申请材料附件url")
    @ApiModelProperty("办理区域附件url")
    private String applicationMaterialUrl;
    /**
     * 办理流程附件url
@@ -166,9 +165,9 @@
    @ApiModelProperty("办理流程附件url")
    private String handlingProceduresUrl;
    /**
     * 收费标准附件url
     * 网上申报附件url
     */
    @ApiModelProperty("收费标准附件url")
    @ApiModelProperty("网上申报附件url")
    private String ratesUrl;
    /**
     * 基础信息附件url
@@ -176,14 +175,14 @@
    @ApiModelProperty("基础信息附件url")
    private String basicInformationFileName;
    /**
     * 附件url
     * 现场申报附件url
     */
    @ApiModelProperty("附件url")
    @ApiModelProperty("现场申报附件url")
    private String acceptConditionsFileName;
    /**
     * 申请材料文件名称
     * 办理区域文件名称
     */
    @ApiModelProperty("申请材料文件名称")
    @ApiModelProperty("办理区域文件名称")
    private String applicationMaterialFileName;
    /**
     * 办理流程文件名称
@@ -191,11 +190,10 @@
    @ApiModelProperty("办理流程文件名称")
    private String handlingProceduresFileName;
    /**
     * 收费标准文件名称
     * 网上申报文件名称
     */
    @ApiModelProperty("收费标准文件名称")
    @ApiModelProperty("网上申报文件名称")
    private String ratesFileName;


    /**
     * 操作指引附件url
@@ -203,14 +201,11 @@
    @ApiModelProperty("操作指引附件url")
    private String operationalGuidelineUrl;


   /**
     * 操作指引视频url
     */
    @ApiModelProperty("操作指引视频url")
    private String operationalGuidelineVideoUrl;



    /**
     * 设定依据
@@ -247,13 +242,13 @@
    private String commonProblemName;


    @ApiModelProperty("办理区域")
    @ApiModelProperty("手机移动端申报")
    private String transactionArea;

    @ApiModelProperty("办理区域url")
    @ApiModelProperty("手机移动端申报url")
    private String transactionAreaUrl;

    @ApiModelProperty("办理区域文件名称")
    @ApiModelProperty("手机移动端申报文件名称")
    private String transactionAreaName;


@@ -268,8 +263,6 @@
    @TableField(exist = false)
    @ApiModelProperty(name = "sumClassifyName", value = "分类总名称")
    String  sumClassifyName;



    @ApiModelProperty(name = "operationalGuidelineVideoName", value = "操作指南视频名称")
    private String  operationalGuidelineVideoName;

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

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



@@ -63,7 +65,7 @@
     *
     * @return 结果
     */
    public int selectNum(String userType);
    public int selectNum(@Param("userType") String userType,@Param("userName") String userName);

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

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

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


    SysUser selectData(String userId,String phonenumber);
@@ -48,7 +48,7 @@
     *
     * @return 结果
     */
    public int selectNum(String userType);
    public int selectNum(String userType,String userName);

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

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

@@ -240,8 +240,8 @@
    }

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

    @Override
@@ -284,8 +284,8 @@
    }

    @Override
    public int selectNum(String userType) {
        return baseMapper.selectNum(userType);
    public int selectNum(String userType,String userName) {
        return baseMapper.selectNum(userType,userName);
    }



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

@@ -91,6 +91,9 @@
    <select id="selectNum" parameterType="string" resultType="integer">
        select count(user_id) from automessage_sys_user
        <where>
            <if test="userName != null and userName != ''">
                AND user_name like concat('%', #{userName}, '%')
            </if>
            <if test="userType != null and userType != ''">
                AND user_type=#{userType}
            </if>
@@ -111,9 +114,9 @@
    <select id="selectConfigList" parameterType="string" resultMap="SysUserResult">
        <include refid="selectSysUserVo"/>
        <where>
<!--            <if test="userName != null and userName != ''">-->
<!--                AND user_name like concat('%', #{userName}, '%')-->
<!--            </if>-->
            <if test="userName != null and userName != ''">
                AND user_name like concat('%', #{userName}, '%')
            </if>
            <if test="userType != null and userType != ''">
                AND user_type=#{userType}
            </if>

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

@@ -156,6 +156,7 @@
                AND (matter_name like concat('%', #{keyword}, '%')) or
                    (department_id in (SELECT id FROM automessage_organization_chart WHERE organization_name like concat('%', #{keyword}, '%')))
                    or (classify_id in (SELECT id FROM automessage_classify_administration WHERE classify_name like concat('%', #{keyword}, '%')))
                    or (associate_names like concat('%', #{keyword}, '%'))
            </if>
            <if test="classifyGrade != null and classifyGrade != ''">
                AND (select classify_grade from automessage_classify_administration where automessage_classify_administration.id=classify_id) = #{classifyGrade}
@@ -325,6 +326,7 @@
                AND (matter_name like concat('%', #{keyword}, '%')) or
                (department_id in (SELECT id FROM automessage_organization_chart WHERE organization_name like concat('%', #{keyword}, '%')))
                or (classify_id in (SELECT id FROM automessage_classify_administration WHERE classify_name like concat('%', #{keyword}, '%')))
                or (associate_names like concat('%', #{keyword}, '%'))
            </if>
            <if test="classifyGrade != null and classifyGrade != ''">
                AND (select classify_grade from classify_administration where classify_grade.id=classify_id) = #{classifyGrade}