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

yanghui

2022-11-17 1de0a85c067ceb62413d0f458899dca41b8322d0

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

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

@@ -41,7 +41,7 @@
    public ResultData selectConfigList(@RequestParam(value = "name",required = false) String name,
                                          @RequestParam(value = "type",required = false) String type,
                                       @RequestParam(value = "departmentId",required = false) Integer departmentId){
        List<AutomessagePolicyDocuments> list = iAutomessagePolicyDocumentsService.selectConfigList(name,type,departmentId);
        List<AutomessagePolicyDocuments> list = iAutomessagePolicyDocumentsService.selectConfigList(name,type,departmentId,null);
        return  ResultData.success(list);
    }


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

@@ -7,12 +7,14 @@
import com.dg.core.db.gen.entity.AutomessagePolicyDocuments;
import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.service.IAutomessagePolicyDocumentsService;
import com.dg.core.service.IOrganizationChartService;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.Data;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
@@ -25,6 +27,9 @@

    @Resource
    private IAutomessagePolicyDocumentsService iAutomessagePolicyDocumentsService;

    @Resource
    private IOrganizationChartService iOrganizationChartService;

    /**
     * 获取法律法规政策文件列表（分页）
@@ -44,8 +49,12 @@
                                          @RequestParam(value = "departmentId",required = false) Integer departmentId,
                                          @CurrentUser SysUser sysUser){
        Page<AutomessagePolicyDocuments> pageParam = new Page<>(pageNum,pageSize);
        List<AutomessagePolicyDocuments> list = iAutomessagePolicyDocumentsService.selectConfigList(pageParam,pageSize,name,type,sysUser,departmentId);
        return getDataTable(list,iAutomessagePolicyDocumentsService.selectCountList(name,type,departmentId));
        List<String> ids=null;
        if (sysUser!=null&&(sysUser.getUserType().equals("2")||sysUser.getIsDivisionHead().equals("1"))){
           ids=iOrganizationChartService.getDepartmentId(sysUser.getDepartmentId());
        }
        List<AutomessagePolicyDocuments> list = iAutomessagePolicyDocumentsService.selectConfigList(pageParam,pageSize,name,type,sysUser,departmentId,ids);
        return getDataTable(list,iAutomessagePolicyDocumentsService.selectCountList(name,type,departmentId,ids));
    }

    /**
@@ -62,7 +71,7 @@
    public ResultData selectConfigList(@RequestParam(value = "name",required = false) String name,
                                          @RequestParam(value = "type",required = false) String type,
                                       @RequestParam(value = "departmentId",required = false) Integer departmentId){
        List<AutomessagePolicyDocuments> list = iAutomessagePolicyDocumentsService.selectConfigList(name,type,departmentId);
        List<AutomessagePolicyDocuments> list = iAutomessagePolicyDocumentsService.selectConfigList(name,type,departmentId,null);
        return  ResultData.success(list);
    }


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

@@ -44,6 +44,13 @@
    @ApiModelProperty("系统通知时间")
    private Integer timeoutNotificationNum;


    /**
     * 系统提醒时间
     */
    @ApiModelProperty("系统提醒时间")
    private Integer timeoutRemindNum;

    /**
     * 创建时间
     */

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

@@ -26,7 +26,7 @@
    * @param type 类型
    * @return
    */
   List<AutomessagePolicyDocuments> selectConfigList(IPage<AutomessagePolicyDocuments> page, Integer state, @Param("name") String name, @Param("type") String type, @Param("departmentId") Integer departmentId);
   List<AutomessagePolicyDocuments> selectConfigList(IPage<AutomessagePolicyDocuments> page, Integer state, @Param("name") String name, @Param("type") String type, @Param("departmentId") Integer departmentId, @Param("ids") List<String> ids);


   /**
@@ -35,7 +35,7 @@
    * @param type 类型
    * @return
    */
   List<AutomessagePolicyDocuments> selectConfigList(@Param("name") String name, @Param("type") String type, @Param("departmentId") Integer departmentId);
   List<AutomessagePolicyDocuments> selectConfigList(@Param("name") String name, @Param("type") String type, @Param("departmentId") Integer departmentId, @Param("ids") List<String> ids);


   /**
@@ -48,6 +48,6 @@
    * 获取法律法规政策文件 （统计）
    * @return
    */
  Integer selectCountList(@Param("name") String name, @Param("type") String type,@Param("departmentId") Integer departmentId);
  Integer selectCountList(@Param("name") String name, @Param("type") String type,@Param("departmentId") Integer departmentId, @Param("ids") List<String> ids);

}

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

@@ -15,7 +15,7 @@
     * @param state
     * @return
     */
    List<AutomessagePolicyDocuments> selectConfigList(IPage<AutomessagePolicyDocuments> page, Integer state, String name, String type, SysUser sysUser,Integer departmentId);
    List<AutomessagePolicyDocuments> selectConfigList(IPage<AutomessagePolicyDocuments> page, Integer state, String name, String type, SysUser sysUser,Integer departmentId,  List<String> ids);

    /**
     * 获取法律法规政策文件 （不分页）
@@ -23,7 +23,7 @@
     * @param type 类型
     * @return
     */
    List<AutomessagePolicyDocuments> selectConfigList(String name, String type,Integer departmentId);
    List<AutomessagePolicyDocuments> selectConfigList(String name, String type,Integer departmentId,  List<String> ids);


    /**
@@ -54,5 +54,5 @@
     * 获取法律法规政策文件 （统计）
     * @return
     */
    Integer selectCountList(String name,String type,Integer departmentI);
    Integer selectCountList(String name,String type,Integer departmentId,List<String> ids);
}

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

@@ -16,8 +16,8 @@
public class AutomessagePolicyDocumentsServiceImpl extends ServiceImpl<AutomessagePolicyDocumentsMapper, AutomessagePolicyDocuments> implements IAutomessagePolicyDocumentsService {

    @Override
    public List<AutomessagePolicyDocuments> selectConfigList(IPage<AutomessagePolicyDocuments> page, Integer state, String name, String type, SysUser sysUser,Integer departmentId) {
        List<AutomessagePolicyDocuments> automessagePolicyDocumentsList = baseMapper.selectConfigList(page, state, name, type, departmentId);
    public List<AutomessagePolicyDocuments> selectConfigList(IPage<AutomessagePolicyDocuments> page, Integer state, String name, String type, SysUser sysUser,Integer departmentId,  List<String> ids) {
        List<AutomessagePolicyDocuments> automessagePolicyDocumentsList = baseMapper.selectConfigList(page, state, name, type, departmentId, ids);
        if (sysUser!=null){
        for (AutomessagePolicyDocuments automessagePolicyDocuments:automessagePolicyDocumentsList) {
            if(sysUser.getUserType().equals("1")){//超级管理员
@@ -42,8 +42,8 @@
    }

    @Override
    public List<AutomessagePolicyDocuments> selectConfigList(String name, String type,Integer departmentId) {
        return baseMapper.selectConfigList(name,type,departmentId);
    public List<AutomessagePolicyDocuments> selectConfigList(String name, String type,Integer departmentId,  List<String> ids) {
        return baseMapper.selectConfigList(name,type,departmentId,ids);
    }

    @Override
@@ -71,8 +71,8 @@
    }

    @Override
    public Integer selectCountList(String name,String type,Integer departmentId) {
        return baseMapper.selectCountList(name,type,departmentId);
    public Integer selectCountList(String name,String type,Integer departmentId,List<String> ids) {
        return baseMapper.selectCountList(name,type,departmentId,ids);
    }



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

@@ -161,8 +161,8 @@
        }
        queryResults.setTransactionEventList(searchesAssociate);
        queryResults.setKeywordEntityList(keywordMapper.selectByName(keyWord));
        queryResults.setAutomessagePolicyDocuments(automessagePolicyDocumentsMapper.selectConfigList(keyWord,"2",null));
        queryResults.setRegulations(automessagePolicyDocumentsMapper.selectConfigList(keyWord,"1",null));
        queryResults.setAutomessagePolicyDocuments(automessagePolicyDocumentsMapper.selectConfigList(keyWord,"2",null,null));
        queryResults.setRegulations(automessagePolicyDocumentsMapper.selectConfigList(keyWord,"1",null,null));
        return queryResults;
    }

@@ -196,8 +196,8 @@
        }
        recommendResult.setKeywordEntityList(keywordEntityList);
        List<OrganizationChartEntity> organizationChartEntities = organizationChartMapper.selectByKeyWord(keyWord);
        recommendResult.setAutomessagePolicyDocuments(automessagePolicyDocumentsMapper.selectConfigList(keyWord,"2",null));
        recommendResult.setRegulations(automessagePolicyDocumentsMapper.selectConfigList(keyWord,"1",null));
        recommendResult.setAutomessagePolicyDocuments(automessagePolicyDocumentsMapper.selectConfigList(keyWord,"2",null,null));
        recommendResult.setRegulations(automessagePolicyDocumentsMapper.selectConfigList(keyWord,"1",null,null));
        recommendResult.setOrganizationChartEntityList(organizationChartEntities);
        return recommendResult;
    }

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

@@ -100,6 +100,13 @@
        return ResultData.error("短信发送失败");
    }

    /**
     * 发送短信登录验证码(电信平台)
     *
     * @param tel
     *            电话
     */

    public ResultData sendSmsNew(String tel) {
        String url =
                "https://dxsdk.028lk.com:8082/Api/SendSms?"+"LoginName="+LoginName+"&Pwd="+Pwd+"&FeeType="+FeeType+"&Mobile="+tel+"&Content=";

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

@@ -47,6 +47,12 @@
            <if test="departmentId != null">
                 and department_id  in  (SELECT id from automessage_organization_chart where id=#{departmentId} or parent_id = #{departmentId})
            </if>
            <if test="ids != null">
                and department_id IN
                <foreach collection="ids" item="param"  open="(" close=")" separator=",">
                    #{param}
                </foreach>
            </if>
        </where>
        order by create_time desc
    </select>
@@ -63,6 +69,12 @@
          <if test="departmentId != null">
              and department_id  in  (SELECT id from automessage_organization_chart where id=#{departmentId} or parent_id = #{departmentId})
          </if>
          <if test="ids != null">
              and department_id IN
              <foreach collection="ids" item="param"  open="(" close=")" separator=",">
                  #{param}
              </foreach>
          </if>
        </where>
    </select>


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

@@ -32,6 +32,7 @@
        <id     property="submitType"      column="submit_type"      />
        <id     property="timeoutTime"      column="timeout_time"      />
        <id     property="isPush"      column="is_push"      />
        <id     property="isHideComments"      column="is_hide_comments"      />
    </resultMap>

    <sql id="selectGuideRepairOrderVo">
@@ -42,6 +43,7 @@
            submit_type,
            matter_name,
            timeout_time,
            is_hide_comments,
            is_push,
            (select organization_name from automessage_organization_chart where a.department_id=id)organizationName,
            concat(

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoExpertApi.java

@@ -146,7 +146,7 @@
    @GetMapping("/expertShowList")
    public R expertShowList(@RequestParam(value = "level",required = false)Integer level,
                            @RequestParam(value = "id",required = false)Long id){
        return comSanShuoExpertService.expertShowList(level,id,this.getLoginUserInfo().getAppId());
        return comSanShuoExpertService.expertShowList(level,id,userService.detailUser(this.getUserId()).getData().getAppId());
    }

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActNeighborCircleDOMapper.xml

@@ -692,7 +692,7 @@
        having serviceTimes&lt;>'' and serviceTime&lt;>''
        order by serviceTimes desc
    </select>
    <select id="selectCount" resultType="Integer">
     <select id="selectCount" resultType="Integer">
        select count(id)  from com_act_neighbor_circle
        <where>
            <if test="type!=null">

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSanshuoExpertDao.xml

@@ -121,7 +121,7 @@
    </select>
    <select id="selectExpertCount" resultType="Integer">
        select count(id) from com_sanshuo_expert
        where del_flag=1 and status=1
        where del_flag=1 and status=1 and app_id='wx0cef797390444b75'
        <if test="dto.type != null">
            <if test="dto.type == 2">
                AND level=2