登录选择企业问题；融资管理相关

sc-service/src/main/java/com/huyi/service/conmany/controller/OwnCompanyManageController.java

@@ -8,6 +8,7 @@ import com.huyi.service.conmany.service.IOwnCompanyManageService;
 import com.huyi.service.rel.service.IOwnCompanyRelService;
 import com.huyi.service.util.FlowableService;
 import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
+import com.sun.xml.internal.bind.v2.TODO;
 import com.tianhu.common.core.constant.SalaryConstants;
 import com.tianhu.common.core.domain.R;
 import com.tianhu.common.core.utils.CommonUtil;
@@ -87,6 +88,9 @@ public class OwnCompanyManageController extends BaseController
     @Autowired
     private ISysProductMenuService iSysProductMenuService;
 
+    @Autowired
+    private ISysUserRoleService iSysUserRoleService;
+
     /**
      * 企业四要素认证状态;未认证
      */
@@ -901,6 +905,7 @@ public class OwnCompanyManageController extends BaseController
      */
     @PreAuthorize(hasPermi = "service:company:delete")
     @Log(title = "删除企业信息", businessType = BusinessType.DELETE)
+    @Transactional(rollbackFor=Exception.class)
     @DeleteMapping("/{scyId}")
     public R removeCompany(@PathVariable String scyId) throws Exception
     {
@@ -912,12 +917,48 @@ public class OwnCompanyManageController extends BaseController
         if(list.size() > 0){
             throw new Exception("该企业含有正在存在的业务，不可删除");
         }
+        //删除用户企业关联数据信息
+        LambdaQueryWrapper<SysUserCompanyRel> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(SysUserCompanyRel::getSucrCompanyId,scyId);
+        List<SysUserCompanyRel> relList = iSysUserCompanyRelService.findSysUserCompanyRels(lambdaQueryWrapper);
+        iSysUserCompanyRelService.deleteSysUserCompanyRel(lambdaQueryWrapper);
+        //删除角色数据
+        LambdaQueryWrapper<SysRole> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SysRole::getCompanyId,scyId);
+        List<SysRole> roleList = iSysRoleService.findSysRoles(wrapper);
+        for (SysRole sysRole : roleList){
+            Long roleId = sysRole.getRoleId();
+            LambdaQueryWrapper<SysUserRole> roleLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            roleLambdaQueryWrapper.eq(SysUserRole::getRoleId,roleId);
+            List<SysUserRole> userRoleList = iSysUserRoleService.findSysUserRoles(roleLambdaQueryWrapper);
+            //删除用户角色关联表数据
+            for (SysUserRole sysUserRole : userRoleList){
+                Long rolesId = sysUserRole.getRoleId();
+                Long userId = sysUserRole.getUserId();
+                LambdaQueryWrapper<SysUserRole> userRoleLambdaQueryWrapper = new LambdaQueryWrapper<>();
+                userRoleLambdaQueryWrapper.eq(SysUserRole::getRoleId,rolesId);
+                userRoleLambdaQueryWrapper.eq(SysUserRole::getUserId,userId);
+                iSysUserRoleService.deleteSysUserRole(userRoleLambdaQueryWrapper);
+            }
+            sysRole.setDelFlag("2");
+            iSysRoleService.updateById(sysRole);
+        }
+        //删除企业
         SysCompany sysCompany = new SysCompany();
         //主键
         sysCompany.setScyId(scyId);
         //状态99
         sysCompany.setScyStatus(DELETE_STATE);
         iSysCompanyService.updateById(sysCompany);
+        //审批删除部门分组
+        for(SysUserCompanyRel sysUserCompanyRel : relList) {
+            Long userId = sysUserCompanyRel.getSucrUserId();
+            Long deptId = sysUserCompanyRel.getSucrDeptId();
+//            Map<String, Object> flowableRes = flowableService.deleteFlowableUserGroup(String.valueOf(userId), String.valueOf(deptId));
+//            if (!"200".equals(flowableRes.get("code"))) {
+//                throw new Exception("审批数据删除部门分组失败!");
+//            }
+        }
         return R.ok();
     }
 

sc-service/src/main/java/com/huyi/service/financeRecord/controller/FinanceRecordController.java

@@ -136,15 +136,17 @@ public class FinanceRecordController extends BaseController {
         }else if ("01".equals(zfrTypes)){
             map.put("zfiCoreId",zfrTypes);
         }
-        //00:按开立企业名称查询 01:按接收方企业名称查询 02:按授信额度查询 03:按融资利率查询
+        //00:按开立企业名称查询 01:按融信编号查询 02:按融资编号查询 03:按融资状态查询 04:按接收企业名称查询
         if ("00".equals(zfrQuery)) {
             map.put("coreScyName", zfrValue);
         }else if ("01".equals(zfrQuery)){
-            map.put("supplierScyName", zfrValue);
+            map.put("zfiNumner", zfrValue);
         }else if ("02".equals(zfrQuery)){
-            map.put("zfpcrAmount", zfrValue);
+            map.put("zfrNumber", zfrValue);
         }else if ("03".equals(zfrQuery)){
-            map.put("zfrRate", zfrValue);
+            map.put("zfrStatus", zfrValue);
+        }else if("04".equals(zfrQuery)){
+            map.put("supplierScyName", zfrValue);
         }
 
         IPage<Map> list = financeRecordService.selectFinanceRecordList(map, request);
@@ -153,7 +155,7 @@ public class FinanceRecordController extends BaseController {
             Map<String,String>  m = (Map<String, String>) listAll.get(j);
             m.put("companyType",companyType);
         }
-        return R.ok(list);
+        return R.ok(list,companyId);
     }
 
     /**

sc-service/src/main/java/com/huyi/service/rel/controller/CompanyRelImportController.java

@@ -185,7 +185,7 @@ public class CompanyRelImportController extends BaseController
         String fileName = originalFileName.substring(originalFileName.lastIndexOf("."));
         //只能导入xls或xlsx
         if(!".xlsx".equals(fileName) && !".xls".equals(fileName)){
-            return AjaxResult.error("仅允许导入“xls”或“xlsx”格式文件！");
+            throw new Exception("仅允许导入“xls”或“xlsx”格式文件！");
         }
 
         //获取当前操作人员
@@ -212,7 +212,7 @@ public class CompanyRelImportController extends BaseController
             com.eq(SysCompany::getScySocialCode,code);
             List<SysCompany> list = iSysCompanyService.findSysCompanys(com);
             if(list.size() == 0){
-                return AjaxResult.error("不存在此发起企业，不可进行导入");
+                throw new Exception("不存在此发起企业，不可进行导入");
             }
             hId = list.get(0).getScyId();
             fis.close();
@@ -229,7 +229,7 @@ public class CompanyRelImportController extends BaseController
         //excel数据
         List<Map<String,String>> templateData = ExcelFileUtils.readExecleasy(file,columnName,2);
         if(templateData.size() == 0){
-            return AjaxResult.error("导入数据不能为空");
+            throw new Exception("导入数据不能为空");
         }
         //未添加成功的list
         String userNameList = "";
@@ -304,12 +304,16 @@ public class CompanyRelImportController extends BaseController
             //联系人
             if(CommonUtil.isNotEmpty(scrContarct)){
                 //联系人正则校验
-                String checkNickName = "^([\\u4e00-\\u9fa5]+|[a-zA-Z0-9]+)$";
+                String checkNickName = "^([\\u4e00-\\u9fa5]+|[a-zA-Z]+)$";
                 Pattern regeNickName = Pattern.compile(checkNickName);
                 Matcher matcherNickName = regeNickName.matcher(scrContarct);
                 boolean isMatNickName = matcherNickName.matches();
                 if (!isMatNickName) {
-                    throw new Exception("联系人格式错误,不能含有特殊字符");
+                    userNameList += scyName+",";
+                    failureNum++;
+                    failureMsg.append("<br/>第" + (i+1) + "行数据导入失败,联系人格式错误,不能含有特殊字符");
+                    log.error("新增" + scyName + "的链属失败，联系人格式错误,不能含有特殊字符");
+                    continue;
                 }
                 if(scrContarct.length() <= 30){
                 }else{

sc-service/src/main/resources/mapper/financeRecord/FinanceRecordMapper.xml

@@ -53,6 +53,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="paramMap.companyType == 03">
             and f.zfp_management_id = #{paramMap.companyId}
         </if>
+        <if test="paramMap.zfiNumner != null  and paramMap.zfiNumner != ''">
+            and i.zfi_number  like concat('%', #{paramMap.zfiNumner}, '%')
+        </if>
+        <if test="paramMap.zfrNumber != null  and paramMap.zfrNumber != ''">
+            and r.zfr_number  like concat('%', #{paramMap.zfrNumber}, '%')
+        </if>
         <if test="paramMap.zfrStatus != null  and paramMap.zfrStatus != ''">
             and r.zfr_status = #{paramMap.zfrStatus}
         </if>