新增机构资料管理接口，修改bug

mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/CommonController.java

@@ -132,6 +132,14 @@ public class CommonController {
         }
     }
 
+    @ApiOperation("递归查询机构，用于交 易所子机构管理中添加子机构和经纪人")
+    @RequestMapping(method = RequestMethod.GET, value = "/queryExchSonOrgin")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    public AjaxResult<OrganSelectResult> queryExchSonOrgin(OrganSelectParam vo, HttpServletRequest request) {
+        log.debug("vo.parentuserid={}", vo.getParentuserid());
+        return iCommonService.queryExchSonOrgin(vo,request);
+    }
+
     @ApiOperation("获取省、市、县信息")
     @RequestMapping(method = RequestMethod.GET, value = "/getProvince")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
@@ -218,7 +226,7 @@ public class CommonController {
     }
 
     @ApiOperation("下拉查询商品： 平台+运营机构同时有权限的菜单中过滤商品时使用")
-    @RequestMapping(value = "/queryGoodsSelectYYJG")
+    @RequestMapping(method = RequestMethod.GET, value = "/queryGoodsSelectYYJG")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     public AjaxResult<GoodsSelectResult> queryGoodsSelectYYJG(GoodsSelectParam param, HttpServletRequest request) {
         Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
@@ -401,13 +409,13 @@ public class CommonController {
         return iCommonService.queryTAAccountList(param, request);
     }
 
-    @RequestMapping("/common/queryOrganSelectRole")
+    @RequestMapping(method = RequestMethod.GET, value ="/common/queryOrganSelectRole")
     @ApiOperation("按角色加载机构")
     @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
     public AjaxResult<OrganSelectResult> queryOrganSelectRole(OrganSelectParam vo, HttpServletRequest request) {
         if (StringUtils.isNotBlank(vo.getSubarealevelpath())) {
             Useraccount userAccount = iUseraccountMapper.selectOne(new QueryWrapper<Useraccount>()
-                    .eq("userid",Long.valueOf(vo.getSubarealevelpath().replace(",", ""))));
+                    .eq("userid", Long.valueOf(vo.getSubarealevelpath().replace(",", ""))));
             vo.setSubarealevelpath(userAccount.getSubarealevelpath());
         }
         return iCommonService.queryOrganSelect(vo, request);

mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/OrganSonController.java

@@ -1,13 +1,14 @@
 package com.muchinfo.mtp3century.controller;
 
-import com.muchinfo.mtp3century.service.IOrganService;
 import com.muchinfo.mtp3century.service.IOrganSonService;
+import com.muchinfo.mtp3century.service.IUseraccountService;
 import com.muchinfo.mtp3century.utils.CenturyDecryptUtil;
 import com.muchinfo.mtp3common.enumtype.Constants;
 import com.muchinfo.mtp3common.enumtype.MessageType;
 import com.muchinfo.mtp3common.vo.AjaxResult;
 import com.muchinfo.mtp3common.utils.JsonUtils;
 import com.muchinfo.mtp3common.vo.PageResult;
+import com.muchinfo.mtp3pojos.vo.investor.InvestorModifyAuditParam;
 import com.muchinfo.mtp3pojos.vo.organ.UserAccountReqParam;
 import com.muchinfo.mtp3pojos.vo.organ.UserAccountRspResult;
 import com.muchinfo.mtp3pojos.vo.organ.son.OrganAddSonOrganParam;
@@ -29,6 +30,8 @@ public class OrganSonController {
     private final Logger log = LoggerFactory.getLogger(this.getClass());
     @Resource
     private IOrganSonService iOrganSonService;
+    @Resource
+    private IUseraccountService iUseraccountService;
 
     @ApiOperation("会员机构管理-->子机构管理-->获取机构列表")
     @RequestMapping(method = RequestMethod.GET, value = "/query")
@@ -103,4 +106,32 @@ public class OrganSonController {
             return AjaxResult.error(Constants.Error_Code_Design, MessageType.MESSAGE_ERROR_CODE_SYSTEM002.getCode(), request.getHeader("Accept-Language"));
         }
     }
+
+    @ApiOperation("会员机构管理-->子机构管理-->新增子机构审核-->获取机构列表")
+    @RequestMapping(method = RequestMethod.GET, value = "/queryaudit")
+    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    private PageResult<UserAccountRspResult> queryaudit(UserAccountReqParam param, HttpServletRequest request) {
+        return iOrganSonService.queryaudit(param, request);
+    }
+
+    @ApiOperation("会员机构管理-->子机构管理-->新增子机构审核-->审核")
+    @RequestMapping(method = RequestMethod.GET, value = "/auditorganson")
+    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    private AjaxResult auditorganson(Long userid, Long auditflag, String msg, HttpServletRequest request) {
+        return iOrganSonService.auditorganson(userid, auditflag, msg, request);
+    }
+
+    @ApiOperation("会员机构管理-->子机构管理-->子机构变更审核-->获取机构列表")
+    @RequestMapping(method = RequestMethod.GET, value = "/queryOrganSonModify")
+    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    private PageResult<UserAccountRspResult> queryOrganSonModify(UserAccountReqParam param, HttpServletRequest request) {
+        return iOrganSonService.queryOrganSonModify(param, request);
+    }
+
+    @ApiOperation("会员机构管理-->子机构管理-->子机构变更审核-->审核")
+    @RequestMapping(method = RequestMethod.GET, value = "/modifyAudit")
+    @ApiResponse(code = 200, message = "成功", response = AjaxResult.class)
+    public AjaxResult modifyAudit(InvestorModifyAuditParam param, HttpServletRequest request) {
+        return iUseraccountService.modifyAudit(param, request);
+    }
 }

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/ICommonService.java

@@ -78,4 +78,6 @@ public interface ICommonService {
     AjaxResult<TaAccountQueryResult> queryTAAccountList(TaAccountReportParam param, HttpServletRequest request);
 
     AjaxResult queryMobileByUserId(Long userid, HttpServletRequest request);
+
+    AjaxResult<OrganSelectResult> queryExchSonOrgin(OrganSelectParam vo, HttpServletRequest request);
 }

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/IOrganSonService.java

@@ -28,4 +28,10 @@ public interface IOrganSonService {
     AjaxResult editsonorgan(OrganAddSonOrganParam param, HttpServletRequest request) throws Exception;
 
     AjaxResult edit(OrganAddSonOrganParam current, HttpServletRequest request);
+
+    PageResult<UserAccountRspResult> queryaudit(UserAccountReqParam param, HttpServletRequest request);
+
+    AjaxResult auditorganson(Long userid, Long auditflag, String msg, HttpServletRequest request);
+
+    PageResult<UserAccountRspResult> queryOrganSonModify(UserAccountReqParam param, HttpServletRequest request);
 }

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/CommonServiceImpl.java

@@ -789,6 +789,12 @@ public class CommonServiceImpl implements ICommonService {
         return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), mobile);
     }
 
+    @Override
+    public AjaxResult<OrganSelectResult> queryExchSonOrgin(OrganSelectParam vo, HttpServletRequest request) {
+        List<OrganSelectResult> organSelectVo = iUseraccountMapper.queryExchSonOrgin(vo);
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), organSelectVo);
+    }
+
 
     public List<TaAccountQueryResult> queryTAAccount(TaAccountReportParam param) {
         return iTaaccountMapper.queryTAAccount(param);

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/OrganSonServiceService.java

@@ -51,14 +51,13 @@ public class OrganSonServiceService implements IOrganSonService {
 
     private final Logger log = LoggerFactory.getLogger(this.getClass());
 
+    @Resource
     private ISystemmanagerMapper iSystemmanagerMapper;
     @Resource
     private ICommonService iCommonService;
     @Resource
     private IUseraccountMapper iUseraccountMapper;
     @Resource
-    private IBankBankinfoMapper iBankBankinfoMapper;
-    @Resource
     private IUserinfoMapper iUserinfoMapper;
     @Resource
     private IUserauthinfoMapper iUserauthinfoMapper;
@@ -107,11 +106,15 @@ public class OrganSonServiceService implements IOrganSonService {
     public PageResult<UserAccountRspResult> querySon(UserAccountReqParam param, HttpServletRequest request) {
         Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
         if (systemmanager.getReletype() == 3) {
-            if (param.getParentuserid() == null)
+            if (param.getParentuserid() == null) {
                 param.setParentuserid(param.getMemberuserid());
+            }
             //父级和所属会员两个条件同时查，查不出来子机构，所以把所属会员条件去掉
             param.setMemberuserid(null);
         }
+        if (systemmanager.getReletype() == 1) {
+            param.setMemberuserid(null);
+        }
         IPage<UserAccountRspResult> page = new Page<>(param.getPageNum(), param.getPageSize());
         IPage<UserAccountRspResult> userAccountVos = iUseraccountMapper.querySonOrganPage(page, param);
         PageResult<UserAccountRspResult> pageResult = new PageResult<>();
@@ -647,8 +650,6 @@ public class OrganSonServiceService implements IOrganSonService {
                         return AjaxResult.error(Constants.Error_Code_Design, MessageType.ORGAN_ERROR_CODE_011.getCode(), request.getHeader("Accept-Language"));
                     }
                 }
-
-
             }
         }
         if (ui.getUserinfotype() == 2 && !ui.getCustomername().equals(param.getCustomername().trim())) {
@@ -719,6 +720,71 @@ public class OrganSonServiceService implements IOrganSonService {
         return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
     }
 
+    @Override
+    public PageResult<UserAccountRspResult> queryaudit(UserAccountReqParam param, HttpServletRequest request) {
+        IPage<UserAccountRspResult> page = new Page<>(param.getPageNum(), param.getPageSize());
+        IPage<UserAccountRspResult> userAccountVos = iUseraccountMapper.querySonOrganPage(page, param);
+        PageResult<UserAccountRspResult> pageResult = new PageResult<>();
+        pageResult.setCode(Constants.Success_Code_Design);
+        pageResult.setMessage(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language")));
+        pageResult.setPages(userAccountVos.getPages());
+        pageResult.setCurrent(userAccountVos.getCurrent());
+        pageResult.setTotal(userAccountVos.getTotal());
+        pageResult.setPageSize(userAccountVos.getSize());
+        pageResult.setData(userAccountVos.getRecords());
+        return pageResult;
+    }
+
+    @Override
+    public AjaxResult auditorganson(Long userid, Long auditflag, String msg, HttpServletRequest request) {
+        Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
+        Useraccount entity = iUseraccountMapper.selectOne(new QueryWrapper<Useraccount>().eq("userid", userid));
+        Integer accountstatus;
+        List<Systemmanager> smList = iSystemmanagerMapper.selectList(new QueryWrapper<Systemmanager>().eq("areauserid", userid));
+        if (auditflag != 1) {
+            accountstatus = SysEnums.AccountStatusEnum.REFUSED.getType();
+            //审核拒绝时，登录账号状态改为停用
+            for (Systemmanager sm : smList) {
+                sm.setManagerstatus(2);
+                iSystemmanagerMapper.update(sm, new QueryWrapper<Systemmanager>().eq("autoid", sm.getAutoid()));
+            }
+        } else {
+            accountstatus = SysEnums.AccountStatusEnum.NORMAL.getType();
+            for (Systemmanager sm : smList) {
+                if (sm.getManagerstatus() != 1) {
+                    sm.setManagerstatus(1);
+                    iSystemmanagerMapper.update(sm, new QueryWrapper<Systemmanager>().eq("autoid", sm.getAutoid()));
+                }
+            }
+        }
+
+        entity.setAccountstatus(accountstatus);
+        entity.setModifierid(systemmanager.getAutoid());
+        entity.setModifytime(new Date());
+        entity.setAudituserid(systemmanager.getAutoid());
+        entity.setAuditremark(msg);
+        iUseraccountMapper.update(entity, new QueryWrapper<Useraccount>().eq("userid", entity.getUserid()));
+
+        systemmanagerService.writeOperateLog(SysConstants.PART_CODE_ORGZ_ZJG, "审核确认id=" + entity.getUserid(), systemmanager, null, null, null);
+
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
+    }
+
+    @Override
+    public PageResult<UserAccountRspResult> queryOrganSonModify(UserAccountReqParam param, HttpServletRequest request) {
+        IPage<UserAccountRspResult> page = new Page<>(param.getPageNum(), param.getPageSize());
+        IPage<UserAccountRspResult> userAccountVos = iUseraccountMapper.queryOrganSonModify(page, param);
+        PageResult<UserAccountRspResult> pageResult = new PageResult<>();
+        pageResult.setCode(Constants.Success_Code_Design);
+        pageResult.setMessage(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language")));
+        pageResult.setPages(userAccountVos.getPages());
+        pageResult.setCurrent(userAccountVos.getCurrent());
+        pageResult.setTotal(userAccountVos.getTotal());
+        pageResult.setPageSize(userAccountVos.getSize());
+        pageResult.setData(userAccountVos.getRecords());
+        return pageResult;
+    }
+
     public void addSonOrgan(OrganAddSonOrganParam param, Systemmanager systemmanager) {
         String lPwd = iCommonService.getSystemParam(Constants.REDIS_HEADER_SYSPARAM, SysConstants.SYSPARAM_CODE_DEFAULT_PWD);
         Useraccount organ = new Useraccount();

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/UseraccountServiceImpl.java

@@ -510,7 +510,6 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
                         });
                     }
                 } catch (Exception e) {
-                    e.printStackTrace();
                     log.error("发送用户变更通知失败，失败原因：" + e);
                 }
 

mtp3-century/src/main/resources/mapper/UseraccountMapper.xml

@@ -214,16 +214,16 @@
         from useraccount o
         left join tmp on o.userid = tmp.userid
         <where>
-            <if test="vo.accountName != null and vo.accountName != '' ">
+            <if test="vo.accountname != null and vo.accountname != '' ">
                 and ((o.accountname like
-                '%'||#{vo.accountName}||'%')
-                or(o.userid like '%'||#{vo.accountName}||'%'))
+                '%'||#{vo.accountname}||'%')
+                or(o.userid like '%'||#{vo.accountname}||'%'))
             </if>
             <if test="vo.usertype != null">
                 and o.usertype = #{vo.usertype}
             </if>
-            <if test="vo.accountStatus != null">
-                and o.accountstatus = #{vo.accountStatus}
+            <if test="vo.accountstatus != null">
+                and o.accountstatus = #{vo.accountstatus}
             </if>
             <if test="vo.parentuserid != null">
                 and o.parentuserid = #{vo.parentuserid}
@@ -280,6 +280,9 @@
             <if test="vo.parentuserid != null">
                 and o.parentuserid = #{vo.parentuserid}
             </if>
+            <if test="vo.subarealevel != null and vo.subarealevel != ''">
+                and o.subarealevel = #{vo.subarealevel}
+            </if>
             <if test="vo.memberuserid != null">
                 and o.memberuserid = #{vo.memberuserid}
             </if>
@@ -816,4 +819,45 @@
           and t.userid = #{userid}
           and t.defaultaccounttype = 2
     </select>
+    <select id="queryExchSonOrgin" resultType="com.muchinfo.mtp3pojos.vo.common.OrganSelectResult"
+            parameterType="com.muchinfo.mtp3pojos.vo.common.OrganSelectParam">
+        <![CDATA[select t.userid,t.accountname,t.parentuserid,t.memberuserid from useraccount t
+        left join arearole a on t.userid = a.userid]]>
+        <where>
+            <if test="vo.roles != null and vo.roles !='' and vo.usertype != null and vo.usertype !=''">
+                <![CDATA[and ((a.roletype in (${vo.roles}) and t.usertype=2) or t.usertype in (${vo.usertype}))
+				and length(t.subarealevelpath)-length(replace(t.subarealevelpath,','))<${vo.level}]]>
+            </if>
+            <if test="vo.searchcode != null and vo.searchcode !=''">
+                <![CDATA[and (t.accountname like
+				'%'||#{vo.searchcode}||'%' or t.userid like
+				'%'||#{vo.searchcode}||'%')]]>
+            </if>
+        </where>
+        and rownum &lt;= 10
+    </select>
+    <select id="queryOrganSonModify" resultType="com.muchinfo.mtp3pojos.vo.organ.UserAccountRspResult">
+        select o.*
+        from draft_useraccount_new o
+        left join (SELECT (LEVEL - 1) subarealevel, t.*
+        FROM useraccount t
+        where t.usertype in (3, 4)
+        START WITH t.userid = 1
+        CONNECT BY PRIOR t.userid = t.parentuserid
+        ORDER BY LEVEL) ua on o.userid = ua.userid
+        <where>
+            and o.usertype in (3,4) and o.modifystatus = 4
+            <if test="vo.subarealevel != null and vo.subarealevel != '' ">
+                and ua.subarealevel = #{vo.subarealevel}
+            </if>
+            <if test="vo.accountname != null and vo.accountname != '' ">
+                and ((o.accountname like '%'||#{vo.accountname,jdbcType=VARCHAR}||'%')
+                or(o.userid like '%'||#{vo.accountname,jdbcType=VARCHAR}||'%'))
+            </if>
+            <if test="vo.accountstatus != null">
+                and o.accountstatus = #{vo.accountstatus}
+            </if>
+        </where>
+        order by o.modifytime desc,o.accountstatus,o.userid
+    </select>
 </mapper>

mtp3-interface/src/main/java/com/muchinfo/mtp3interface/mapper/IUseraccountMapper.java

@@ -84,4 +84,8 @@ public interface IUseraccountMapper extends BaseMapper<Useraccount> {
     List<Useraccount> queryUserAccount(@Param("userid") Long userid);
 
     List<Userreckonaccount> queryUra(@Param("userid")Long userid);
+
+    List<OrganSelectResult> queryExchSonOrgin(@Param("vo") OrganSelectParam vo);
+
+    IPage<UserAccountRspResult> queryOrganSonModify(IPage<UserAccountRspResult> page,@Param("vo") UserAccountReqParam param);
 }

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/organ/UserAccountReqParam.java

@@ -18,13 +18,13 @@ public class UserAccountReqParam {
     private Integer usertype;
 
     @ApiModelProperty(value = "机构")
-    private String accountName;
+    private String accountname;
 
     @ApiModelProperty(value = "市场权限")
     private Long markets;
 
     @ApiModelProperty(value = "机构状态")
-    private Integer accountStatus;
+    private Integer accountstatus;
 
     @ApiModelProperty(value = "一级机构代码")
     private Long memberuserid;
@@ -41,6 +41,9 @@ public class UserAccountReqParam {
     @ApiModelProperty(value = "角色")
     private String roles;
 
+    @ApiModelProperty(value = "类型")
+    private Integer subarealevel;
+
     private Integer pageNum;
 
     private Integer pageSize;

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/organ/UserAccountRspResult.java

@@ -45,4 +45,7 @@ public class UserAccountRspResult extends Useraccount {
 
     @ApiModelProperty(value = "联系人")
     private String contactname;
+
+    @ApiModelProperty(value = "所属会员")
+    private String memberusername;
 }