Merge remote-tracking branch 'origin/master'

sc-service/src/main/java/com/huyi/service/credit/controller/CreditHandleController.java

@@ -335,6 +335,41 @@ public class CreditHandleController extends BaseController {
 
 
     /**
+     * 融信删除
+     * @param map
+     * @return
+     * @throws Exception
+     */
+    @PreAuthorize(hasPermi = "credit:credit:del")
+    @Log(title = "融信", businessType = BusinessType.UPDATE)
+    @Transactional(rollbackFor = Exception.class)
+    @PutMapping("/creditDel")
+    public AjaxResult creditDel(@RequestBody Map<String,Object> map)throws Exception
+    {
+        //获取融信编号
+        String zfiId = CommonUtil.objToString(map.get("zfiId"));
+        ZcFinanceInf financeInf = new ZcFinanceInf();
+        //获取时间
+        Date  time =  DateUtils.getNowDate();
+        //获取此操作员
+        LoginUser userInfo = tokenService.getLoginUser();
+        SysUser user = userInfo.getSysUser();
+        //编号
+        financeInf.setZfiId(zfiId);
+        //修改时间
+        financeInf.setUpdateTime(time);
+        //获取用户编号
+        String userId = user.getUserId()+"";
+        //修改人
+        financeInf.setUpdateBy(userId);
+        //删除
+        financeInf.setZfiStatus("99");
+        financeInfService.updateById(financeInf);
+        return AjaxResult.success();
+    }
+
+
+    /**
      * 获取合同文件
      * @param map
      * @return
@@ -403,7 +438,7 @@ public class CreditHandleController extends BaseController {
 
         }
         if(CommonUtil.isEmpty(code)){
-            throw new Exception("盖章节点异常");
+            throw new Exception("节点异常");
         }
         //获取接收方
         String zfiSupplierId = CommonUtil.objToString(map.get("zfiSupplierId"));

sc-service/src/main/resources/mapper/credit/OwnCreditMapper.xml

@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ON s.scy_id = f.zfi_core_id
             LEFT JOIN zc_finance_product p
             ON p.zfp_id = f.zfi_product_id
-            WHERE 1=1
+            WHERE f.zfi_status != '99'
 
         <if test="paramMap.companyType != null  and paramMap.zfiId != '' and paramMap.companyId != null  and paramMap.companyId != ''">
             <!--核心企业 开立方是自己的-->