费用，企业，链属修改

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

@@ -122,6 +122,8 @@ public class OwnCompanyManageController extends BaseController
         if(CommonUtil.isNotEmpty(sysCompany.getScyType())) {
             queryWrapper.eq(SysCompany::getScyType, sysCompany.getScyType());
         }
+        //创建时间倒序排列
+        queryWrapper.orderByDesc(SysCompany::getCreateTime);
         IPage<SysCompany> list = iSysCompanyService.findSysCompanys(request,queryWrapper);
         return R.ok(list);
     }
@@ -292,6 +294,82 @@ public class OwnCompanyManageController extends BaseController
         return R.ok();
     }
 
+
+    /**
+     * 获取企业明细信息(四要素审核专用)
+     */
+    @GetMapping("/queryExam/{scyId}")
+    public R queryExam(@PathVariable("scyId") String scyId) throws Exception {
+
+        LambdaQueryWrapper<SysCompany> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(SysCompany::getScyId,scyId);
+        List<SysCompany> list = iSysCompanyService.findSysCompanys(queryWrapper);
+        if(list.size() > 0) {
+                //经办人信息
+                LambdaQueryWrapper<SysUserCompanyRel> sysUserCompanyRel = new LambdaQueryWrapper<>();
+                sysUserCompanyRel.eq(SysUserCompanyRel::getSucrCompanyId,scyId);
+                sysUserCompanyRel.eq(SysUserCompanyRel::getSucrHandler,HANDER);
+                List<SysUserCompanyRel> contactsList = iSysUserCompanyRelService.findSysUserCompanyRels(sysUserCompanyRel);
+                List<Map> userList = null;
+                List<Map> handlerPositiveList = null;
+                List<Map> handlerNegativeList = null;
+
+                Map queryMap = new HashMap();
+                queryMap.put("companyId",scyId);
+                //发票信息
+                List<Map> invoiceList = iOwnCompanyManageService.selectInvoiceList(queryMap);
+                //营业执照信息
+                List<Map> licenseList = iOwnCompanyManageService.selectLicenseFileList(queryMap);
+                //法人证件正面信息
+                List<Map> legalFileList = iOwnCompanyManageService.selectLegalFileList(queryMap);
+                //法人证件反面信息
+                List<Map> legalBackFileList = iOwnCompanyManageService.selectLegalBackFileList(queryMap);
+                //法人授权书信息
+                List<Map> authorizationList = iOwnCompanyManageService.selectAuthorizationFileList(queryMap);
+                //数字证书授权与承诺书信息
+                List<Map> commitmentList = iOwnCompanyManageService.selectCommitmentFileList(queryMap);
+                //其他附件
+                List<Map> appendixList = iOwnCompanyManageService.selectAppendixFileList(queryMap);
+                /*返回结果*/
+                Map map = new HashMap();
+                //基本信息
+                map.put("basicList",list);
+                //经办人信息
+                if(contactsList.size() > 0) {
+                    Long sucrUserId = contactsList.get(0).getSucrUserId();
+                    Map userMap = new HashMap();
+                    userMap.put("userId",sucrUserId);
+                    userList = iOwnCompanyManageService.selectUserList(userMap);
+                    Map handlerMap = new HashMap();
+                    handlerMap.put("userId",sucrUserId);
+                    handlerPositiveList  = iOwnCompanyManageService.handlerPositiveList(handlerMap);
+                    handlerNegativeList = iOwnCompanyManageService.handlerNegativeList(handlerMap);
+                }
+                map.put("contactsList", userList);
+                //发票信息
+                map.put("invoiceList", invoiceList);
+                //营业执照信息
+                map.put("licenseList",licenseList);
+                //法人证件正面信息
+                map.put("legalList",legalFileList);
+                //法人证件反面信息
+                map.put("legalBackList",legalBackFileList);
+                //经办人证件正面信息
+                map.put("handlerPositiveList",handlerPositiveList);
+                //经办人证件反面信息
+                map.put("handlerNegativeList",handlerNegativeList);
+                //法人授权书信息
+                map.put("authorizationList",authorizationList);
+                //数字证书授权与承诺书信息
+                map.put("commitmentList",commitmentList);
+                //其他附件
+                map.put("appendixList",appendixList);
+                return R.ok(map);
+        }else {
+            throw new Exception("企业不存在");
+        }
+    }
+
     /**
      * 修改企业信息
      */
@@ -472,13 +550,13 @@ public class OwnCompanyManageController extends BaseController
         if(CommonUtil.isEmpty(state)){
             throw new Exception("要执行信息的状态为空");
         }
-        //执行
-        SysCompany sysCompany = new SysCompany();
-        sysCompany.setScyId(scyId);
-        sysCompany.setScyStatus(state);
-        sysCompany.setUpdateBy(userId);
-        sysCompany.setUpdateTime(DateUtils.getNowDate());
-        iSysCompanyService.updateById(sysCompany);
+            //执行
+            SysCompany sysCompany = new SysCompany();
+            sysCompany.setScyId(scyId);
+            sysCompany.setScyAuthStatus(state);
+            sysCompany.setUpdateBy(userId);
+            sysCompany.setUpdateTime(DateUtils.getNowDate());
+            iSysCompanyService.updateById(sysCompany);
         return R.ok();
     }
 

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

@@ -106,13 +106,13 @@ public class OwnCompanyRelController extends BaseController
         String companyId = user.getSysUser().getCompanyId();
         Map map = new HashMap();
         if(!SalaryConstants.OPEX.equals(companyId)) {
-            if (CommonUtil.isNotEmpty(scyId)) {
-                map.put("companyId", scyId);
-            }
             if (CommonUtil.isEmpty(scyId)) {
                 map.put("companyId", companyId);
             }
         }
+        if (CommonUtil.isNotEmpty(scyId)) {
+            map.put("companyId", scyId);
+        }
         if(CommonUtil.isNotEmpty(companyName)) {
             map.put("companyName", companyName);
         }
@@ -161,11 +161,41 @@ public class OwnCompanyRelController extends BaseController
             queryWrapper.eq(SysCompanySpare::getScpType,scrType);
         }
         queryWrapper.eq(SysCompanySpare::getScpStatus,NORMAL_STATE);
+        queryWrapper.orderByDesc(SysCompanySpare::getCreateTime);
         IPage<SysCompanySpare> notCertifiedList = iSysCompanySpareService.findSysCompanySpares(request,queryWrapper);
         return R.ok(notCertifiedList);
     }
 
     /**
+     * 查询链属未认证列表
+     * @param scySocialCode 社会统一信用代码
+     * @param companyName   企业名称
+     * @param scrType   企业类型
+     * @param request
+     * @return
+     */
+    @PreAuthorize(hasPermi = "service:rel:list")
+    @GetMapping("/adminSpareList")
+    public R adminSpareList(String scySocialCode, String companyName, String scrType, QueryRequest request)
+    {
+        Map map = new HashMap();
+        //社会统一信用代码
+        if(CommonUtil.isNotEmpty(scySocialCode)){
+            map.put("scySocialCode",scySocialCode);
+        }
+        //企业名称
+        if(CommonUtil.isNotEmpty(companyName)){
+            map.put("companyName",companyName);
+        }
+        //企业类型
+        if(CommonUtil.isNotEmpty(scrType)){
+            map.put("scrType",scrType);
+        }
+        IPage<Map> notCertifiedList = iOwnCompanyRelService.adminSpareList(request,map);
+        return R.ok(notCertifiedList);
+    }
+
+    /**
      * 重邀
      * @param map
      * @return

sc-service/src/main/java/com/huyi/service/rel/mapper/OwnCompanyRelMapper.java

@@ -26,4 +26,12 @@ public interface OwnCompanyRelMapper extends BaseMapper<SysCompanyRel> {
      * @return
      */
     public IPage<Map> selectCompanyRelList(Page<Map> page, @Param("paramMap")Map map);
+
+    /**
+     * 查询链属信息
+     * @param page
+     * @param map
+     * @return
+     */
+    public IPage<Map> adminSpareList(Page<Map> page, @Param("paramMap")Map map);
 }

sc-service/src/main/java/com/huyi/service/rel/service/IOwnCompanyRelService.java

@@ -25,4 +25,12 @@ public interface IOwnCompanyRelService extends IService<SysCompanyRel> {
      * @return
      */
     public IPage<Map> selectCompanyRelList(QueryRequest request, Map map);
+
+    /**
+     * 查询未认证信息（平台用）
+     * @param request
+     * @param map
+     * @return
+     */
+    public IPage<Map> adminSpareList(QueryRequest request, Map map);
 }

sc-service/src/main/java/com/huyi/service/rel/service/impl/OwnCompanyRelServiceImpl.java

@@ -35,4 +35,10 @@ public class OwnCompanyRelServiceImpl extends ServiceImpl<OwnCompanyRelMapper, S
         Page page = new Page<>(request.getPageNum(), request.getPageSize());
         return ownCompanyRelMapper.selectCompanyRelList(page,map);
     }
+
+    @Override
+    public IPage<Map> adminSpareList(QueryRequest request, Map map) {
+        Page page = new Page<>(request.getPageNum(), request.getPageSize());
+        return ownCompanyRelMapper.adminSpareList(page,map);
+    }
 }

sc-service/src/main/resources/mapper/cost/OwnCostManageMapper.xml

@@ -85,7 +85,7 @@
         LEFT JOIN sys_company c  ON c.scy_id = zfi_core_id
         LEFT JOIN sys_company s  ON s.scy_id = zfi_supplier_id
         WHERE 1=1
-            AND z.zci_invoice_status != '0' AND z.zci_invoice_status != '1'
+            AND z.zci_invoice_status != '1'
         <if test="paramMap.zfrNumber != null and paramMap.zfrNumber != '' ">
             AND zfr_number LIKE CONCAT('%', #{paramMap.zfrNumber}, '%')
         </if>
@@ -139,7 +139,7 @@
         LEFT JOIN sys_company c  ON c.scy_id = zfi_core_id
         LEFT JOIN sys_company s  ON s.scy_id = zfi_supplier_id
         WHERE 1=1
-            AND (z.zci_invoice_status = '0' OR z.zci_invoice_status = '1')
+            AND z.zci_invoice_status = '1'
         <if test="paramMap.zfrNumber != null and paramMap.zfrNumber != '' ">
             AND zfr_number LIKE CONCAT('%', #{paramMap.zfrNumber}, '%')
         </if>

sc-service/src/main/resources/mapper/rel/OwnCompanyRelMapper.xml

@@ -52,4 +52,39 @@
         AND r.scr_status != '99'
         ORDER BY r.create_time DESC
     </select>
+
+    <select id="adminSpareList" parameterType="map" resultType="map">
+        SELECT
+        s.scp_id                  'scpId',
+        s.scp_company_id          'scpCompanyId',
+        s.scp_name                'scpName',
+        s.scp_social_code         'scpSocialCode',
+        s.scp_contarct            'scpContarct',
+        s.scp_contarct_phone      'scpContarctPhone',
+        s.scp_contarct_email      'scpContarctEmail',
+        s.scp_type                'scpType',
+        s.scp_remarks             'scpRemarks',
+        s.scp_status              'scpStatus',
+        s.scp_invite              'scpInvite',
+        s.create_by               'createBy',
+        s.create_time             'createTime',
+        s.update_by               'updateBy',
+        s.update_time             'updateTime',
+        scy_name                  'scyName'
+        FROM sys_company_spare s
+        LEFT JOIN sys_company ON s.scp_company_id = scy_id
+        WHERE 1=1
+        <if test="paramMap.scySocialCode != null and paramMap.scySocialCode != '' ">
+            AND s.scp_social_code LIKE CONCAT('%', #{paramMap.scySocialCode}, '%')
+        </if>
+        <if test="paramMap.companyName != null and paramMap.companyName != '' ">
+            AND s.scp_name LIKE CONCAT('%', #{paramMap.companyName}, '%')
+        </if>
+        <if test="paramMap.scrType != null and paramMap.scrType != '' ">
+            AND s.scp_type = #{paramMap.scrType}
+        </if>
+        AND s.scp_status = '00'
+        ORDER BY s.create_time DESC
+    </select>
+
 </mapper>