企业修改

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

@@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huyi.service.base.entity.*;
 import com.huyi.service.base.service.*;
 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.tianhu.common.core.constant.SalaryConstants;
 import com.tianhu.common.core.domain.R;
 import com.tianhu.common.core.utils.CommonUtil;
 import com.tianhu.common.core.utils.DateUtils;
@@ -67,6 +69,10 @@ public class OwnCompanyManageController extends BaseController
 
     @Autowired
     private FlowableService flowableService;
+
+    @Autowired
+    private IOwnCompanyRelService iOwnCompanyRelService;
+
     /**
      * 企业四要素认证状态;未认证
      */
@@ -127,31 +133,43 @@ public class OwnCompanyManageController extends BaseController
     @GetMapping("/list")
     public R list(SysCompany sysCompany, QueryRequest request)
     {
+        //获取当前操作员
+        LoginUser user = tokenService.getLoginUser();
+        String companyId = user.getSysUser().getCompanyId();
+
         LambdaQueryWrapper<SysCompany> queryWrapper = new LambdaQueryWrapper<>();
+        Map map = new HashMap();
+        map.put("companyId",companyId);
         //企业名称
         if(CommonUtil.isNotEmpty(sysCompany.getScyName())) {
             queryWrapper.like(SysCompany::getScyName, sysCompany.getScyName());
+            map.put("scyName",sysCompany.getScyName());
         }
         //企业统一信用代码
         if(CommonUtil.isNotEmpty(sysCompany.getScySocialCode())) {
             queryWrapper.like(SysCompany::getScySocialCode, sysCompany.getScySocialCode());
+            map.put("scySocialCode",sysCompany.getScySocialCode());
         }
         //企业联系人（法人）
         if(CommonUtil.isNotEmpty(sysCompany.getScyLegal())) {
             queryWrapper.like(SysCompany::getScyLegal, sysCompany.getScyLegal());
+            map.put("scyLegal",sysCompany.getScyLegal());
         }
         //企业联系电话
         if(CommonUtil.isNotEmpty(sysCompany.getScyPhone())) {
             queryWrapper.like(SysCompany::getScyPhone, sysCompany.getScyPhone());
+            map.put("scyPhone",sysCompany.getScyPhone());
         }
         //企业状态不为空
         if(CommonUtil.isNotEmpty(sysCompany.getScyStatus())) {
             if(TREE_STATE.equals(sysCompany.getScyStatus())) {
                 queryWrapper.and(i -> i.eq(SysCompany::getScyStatus, TREE_STATE).or().eq(SysCompany::getScyStatus, "03")
                         .or().eq(SysCompany::getScyStatus, "04"));
+                map.put("scyStatus",sysCompany.getScyStatus());
             }
             if(!TREE_STATE.equals(sysCompany.getScyStatus())){
                 queryWrapper.eq(SysCompany::getScyStatus, sysCompany.getScyStatus());
+                map.put("scyStatus",sysCompany.getScyStatus());
             }
         }
         //企业状态如果为空，则查询正常或停用状态
@@ -159,13 +177,18 @@ public class OwnCompanyManageController extends BaseController
             queryWrapper.ne(SysCompany::getScyStatus, DELETE_STATE);
         }
         //企业类型
-        if(CommonUtil.isNotEmpty(sysCompany.getScyType())) {
+        if(CommonUtil.isNotEmpty(sysCompany.getScyType()) && SalaryConstants.OPEX.equals(companyId)) {
             queryWrapper.eq(SysCompany::getScyType, sysCompany.getScyType());
+            //创建时间倒序排列
+            queryWrapper.orderByDesc(SysCompany::getCreateTime);
+            IPage<SysCompany> list = iSysCompanyService.findSysCompanys(request,queryWrapper);
+            return R.ok(list);
+        }
+        if(CommonUtil.isNotEmpty(sysCompany.getScyType()) && "01".equals(sysCompany.getScyType()) && !SalaryConstants.OPEX.equals(companyId)){
+            IPage<Map> list = iOwnCompanyManageService.creditCompanyList(request,map);
+            return R.ok(list);
         }
-        //创建时间倒序排列
-        queryWrapper.orderByDesc(SysCompany::getCreateTime);
-        IPage<SysCompany> list = iSysCompanyService.findSysCompanys(request,queryWrapper);
-        return R.ok(list);
+        return R.ok();
     }
 
     /**
@@ -235,8 +258,6 @@ public class OwnCompanyManageController extends BaseController
         sysCompany.setScySocialCode(scySocialCode);
         //法人
         sysCompany.setScyLegal(scyLegal);
-        //联系电话
-        sysCompany.setScyPhone(scyPhone);
         //类型（核心企业）
         sysCompany.setScyType(CONFIRM_STATE);
         //企业状态：待四要素状态
@@ -349,9 +370,6 @@ public class OwnCompanyManageController extends BaseController
         queryWrapper.eq(SysCompany::getScyId,scyId);
         List<SysCompany> list = iSysCompanyService.findSysCompanys(queryWrapper);
         if(list.size() > 0) {
-            if (NORMAL_STATE.equals(list.get(0).getScyAuthStatus())) {
-                return R.ok(list);
-            }
             if (NORMAL_STATE.equals(list.get(0).getScyStatus())) {
                 //经办人信息
                 LambdaQueryWrapper<SysUserCompanyRel> sysUserCompanyRel = new LambdaQueryWrapper<>();
@@ -413,6 +431,10 @@ public class OwnCompanyManageController extends BaseController
                 //其他附件
                 map.put("appendixList",appendixList);
                 return R.ok(map);
+            }if (NORMAL_STATE.equals(list.get(0).getScyAuthStatus())) {
+                return R.ok(list);
+            }else if(!NORMAL_STATE.equals(list.get(0).getScyStatus())){
+                return R.ok(list);
             }
         }else {
             throw new Exception("企业不存在");
@@ -420,6 +442,65 @@ public class OwnCompanyManageController extends BaseController
         return R.ok();
     }
 
+    /**
+     * 查询链属列表
+     * @param scySocialCode 社会统一信用代码
+     * @param companyName   企业名称
+     * @param scrType       企业类型
+     * @param scrStatus     链属状态
+     * @param request
+     * @return
+     */
+    @GetMapping("/listRel")
+    public R listRel(String scyId, String scySocialCode, String companyName,
+                  String scrType, String scrStatus, String scrContarct, QueryRequest request)
+    {
+        //获取当前操作员
+        LoginUser user = tokenService.getLoginUser();
+        String companyId = user.getSysUser().getCompanyId();
+        Map map = new HashMap();
+        if(!SalaryConstants.OPEX.equals(companyId)) {
+            if (CommonUtil.isNotEmpty(scyId)) {
+                map.put("companyId", scyId);
+            }else
+            if (CommonUtil.isEmpty(scyId)) {
+                map.put("companyId", companyId);
+            }
+            if(CommonUtil.isNotEmpty(companyName)) {
+                map.put("companyName", companyName);
+            }
+            if(CommonUtil.isNotEmpty(scySocialCode)) {
+                map.put("scySocialCode", scySocialCode);
+            }
+            if(CommonUtil.isNotEmpty(scrType)) {
+                map.put("scrType", scrType);
+            }
+            if(CommonUtil.isNotEmpty(scrStatus)) {
+                map.put("scrStatus", scrStatus);
+            }
+        }else if(SalaryConstants.OPEX.equals(companyId)) {
+            if (CommonUtil.isNotEmpty(scyId)) {
+                map.put("companyId", scyId);
+            }
+            if (CommonUtil.isNotEmpty(companyName)) {
+                map.put("name", companyName);
+            }
+            if (CommonUtil.isNotEmpty(scySocialCode)) {
+                map.put("code", scySocialCode);
+            }
+            if (CommonUtil.isNotEmpty(scrType)) {
+                map.put("type", scrType);
+            }
+            if (CommonUtil.isNotEmpty(scrStatus)) {
+                map.put("status", scrStatus);
+            }
+            if(CommonUtil.isNotEmpty(scrContarct)){
+                map.put("scrContarct",scrContarct);
+            }
+        }
+        IPage<Map> list = iOwnCompanyRelService.selectCompanyRelList(request,map);
+        return R.ok(list,companyId);
+    }
 
     /**
      * 获取企业明细信息(四要素审核专用)
@@ -540,22 +621,22 @@ public class OwnCompanyManageController extends BaseController
             throw new Exception("联系人长度不能超过30字；请检查是否正确");
         }
         //联系电话
-        String scyPhone = CommonUtil.objToString(map.get("scyPhone"));
-        if(CommonUtil.isEmpty(scyPhone)){
-            throw new Exception("联系电话不能为空");
-        }
-        if(CommonUtil.isNotEmpty(scyPhone)) {
-            if(scyPhone.length() > 11){
-                throw new Exception("手机号不能超过11位");
-            }
-            String checkPhone = "^1[3|4|5|6|7|8|9][0-9]\\d{8}$";
-            Pattern regePhone = Pattern.compile(checkPhone);
-            Matcher matcherPhone = regePhone.matcher(scyPhone);
-            boolean isMatPhone = matcherPhone.matches();
-            if (!isMatPhone) {
-                throw new Exception("手机格式不正确");
-            }
-        }
+//        String scyPhone = CommonUtil.objToString(map.get("scyPhone"));
+//        if(CommonUtil.isEmpty(scyPhone)){
+//            throw new Exception("联系电话不能为空");
+//        }
+//        if(CommonUtil.isNotEmpty(scyPhone)) {
+//            if(scyPhone.length() > 11){
+//                throw new Exception("手机号不能超过11位");
+//            }
+//            String checkPhone = "^1[3|4|5|6|7|8|9][0-9]\\d{8}$";
+//            Pattern regePhone = Pattern.compile(checkPhone);
+//            Matcher matcherPhone = regePhone.matcher(scyPhone);
+//            boolean isMatPhone = matcherPhone.matches();
+//            if (!isMatPhone) {
+//                throw new Exception("手机格式不正确");
+//            }
+//        }
         //查询当前企业id的状态
         SysCompany sysCompanyQuery = iSysCompanyService.getById(scyId);
         //执行修改
@@ -569,7 +650,7 @@ public class OwnCompanyManageController extends BaseController
         //法人
         sysCompany.setScyLegal(scyLegal);
         //联系电话
-        sysCompany.setScyPhone(scyPhone);
+//        sysCompany.setScyPhone(scyPhone);
         //类型（核心企业）
         sysCompany.setScyType(sysCompanyQuery.getScyType());
         //企业状态

sc-service/src/main/java/com/huyi/service/conmany/mapper/OwnCompanyManageMapper.java

@@ -89,4 +89,11 @@ public interface OwnCompanyManageMapper extends BaseMapper<SysCompany> {
      */
     public List<Map> handlerNegativeList(@Param("paramMap")Map map);
 
+    /**
+     * 查询已授信的核心企业信息
+     * @param map
+     * @return
+     */
+    public IPage<Map> creditCompanyList(Page<Map> page, @Param("paramMap")Map map);
+
 }

sc-service/src/main/java/com/huyi/service/conmany/service/IOwnCompanyManageService.java

@@ -1,7 +1,9 @@
 package com.huyi.service.conmany.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huyi.service.base.entity.SysCompany;
+import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
 
 import java.util.List;
 import java.util.Map;
@@ -85,4 +87,11 @@ public interface IOwnCompanyManageService extends IService<SysCompany> {
      * @return
      */
     public List<Map> handlerNegativeList(Map map);
+
+    /**
+     * 查询已授信的核心企业信息
+     * @param map
+     * @return
+     */
+    public IPage<Map> creditCompanyList(QueryRequest request, Map map);
 }

sc-service/src/main/java/com/huyi/service/conmany/service/impl/OwnCompanyManageServiceImpl.java

@@ -82,4 +82,9 @@ public class OwnCompanyManageServiceImpl extends ServiceImpl<OwnCompanyManageMap
         return ownCompanyManageMapper.handlerNegativeList(map);
     }
 
+    @Override
+    public IPage<Map> creditCompanyList(QueryRequest request, Map map) {
+        Page page = new Page<>(request.getPageNum(), request.getPageSize());
+        return ownCompanyManageMapper.creditCompanyList(page,map);
+    }
 }

sc-service/src/main/java/com/huyi/service/cost/controller/OwnCostManageController.java

@@ -82,7 +82,7 @@ public class OwnCostManageController extends BaseController
     private String DELETE_STATE = "99";
 
 
-    /**
+/**
  * 查询费用列表
  * @param zfrNumber  融资编号
  * @param zciStatus  费用状态

sc-service/src/main/resources/mapper/company/OwnCompanyManageMapper.xml

@@ -158,4 +158,68 @@
         WHERE s.user_id =  #{paramMap.userId}
     </select>
 
+    <!--查询已授信的企业列表-->
+    <select id="creditCompanyList" parameterType="map" resultType="map">
+        SELECT
+            zfp_id				        'zfpId',
+            zfp_management_id		    'zfpManagementId',
+            zfpcr_company_id		    'zfpcrCompanyId',
+            s.scy_id			        'scyId',
+            s.scy_license_file		    'scyLicenseFile',
+            s.scy_name			        'scyName',
+            s.scy_social_code		    'scySocialCode',
+            s.scy_registered_capital	'scyRegisteredCapital',
+            s.scy_start_time		    'scyStartTime',
+            s.scy_end_time			    'scyEndTime',
+            s.scy_address			    'scyAddress',
+            s.scy_phone			        'scyPhone',
+            s.scy_legal_file		    'scyLegalFile',
+            s.scy_legal_back_file		'scyLegalBackFile',
+            s.scy_legal 			    'scyLegal',
+            s.scy_legal_id			    'scyLegalId',
+            s.scy_authorization_file	'scyAuthorizationFile',
+            s.scy_commitment_file		'scyCommitmentFile',
+            s.scy_appendix_file		    'scyAppendixFile',
+            s.scy_type			        'scyType',
+            s.scy_industry			    'scyIndustry',
+            s.scy_scale			        'scyScale',
+            s.scy_organization		    'scyOrganization',
+            s.scy_manager			    'scyManager',
+            s.scy_cfca_user_id		    'scyCfcaUserId',
+            s.scy_remarks			    'scyRemarks',
+            s.scy_auth_status		    'scyAuthStatus',
+            s.scy_status			    'scyStatus',
+            s.create_by			        'createBy',
+            s.create_time			    'createTime'
+        FROM zc_finance_product
+        LEFT JOIN zc_finance_pro_com_rel ON zfpcr_product_id = zfp_id
+        LEFT JOIN sys_company s ON s.scy_id = zfpcr_company_id
+        WHERE zfpcr_company_id != '000000'
+        <if test="paramMap.companyId != null and paramMap.companyId != '' ">
+            AND zfp_management_id = #{paramMap.companyId}
+        </if>
+        <if test="paramMap.scyName != null and paramMap.scyName != '' ">
+            AND s.scy_name LIKE CONCAT('%', #{paramMap.scyName}, '%')
+        </if>
+        <if test="paramMap.scySocialCode != null and paramMap.scySocialCode != '' ">
+            AND s.scy_social_code LIKE CONCAT('%', #{paramMap.scySocialCode}, '%')
+        </if>
+        <if test="paramMap.scyLegal != null and paramMap.scyLegal != '' ">
+            AND s.scy_legal LIKE CONCAT('%', #{paramMap.scyLegal}, '%')
+        </if>
+        <if test="paramMap.scyPhone != null and paramMap.scyPhone != '' ">
+            AND s.scy_phone LIKE CONCAT('%', #{paramMap.scyPhone}, '%')
+        </if>
+        <if test="paramMap.scyStatus != null and paramMap.scyStatus != '' and paramMap.scyStatus == '02' ">
+            AND (s.scy_status = '02' OR s.scy_status = '03' OR s.scy_status = '04')
+        </if>
+        <if test="paramMap.scyStatus != null and paramMap.scyStatus != '' and paramMap.scyStatus != '02' ">
+            AND s.scy_status = #{paramMap.scyStatus}
+        </if>
+        <if test="paramMap.scyStatus == null and paramMap.scyStatus == '' ">
+            AND s.scy_status != '99'
+        </if>
+        ORDER BY s.create_time DESC
+    </select>
+
 </mapper>