Merge remote-tracking branch 'origin/master'

# Conflicts:
#	sc-service/src/main/java/com/huyi/service/common/flowable/controller/FlowableController.java

sc-service/src/main/java/com/huyi/service/base/entity/SysNotice.java

@@ -1,22 +1,21 @@
 package com.huyi.service.base.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.io.Serializable;
-import java.util.Date;
-
 /**
  * <p>
  * 消息通知表
  * </p>
  *
- * @author xuefy
- * @since 2021-09-08
+ * @author cuixq
+ * @since 2021-09-14
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -45,7 +44,7 @@ public class SysNotice implements Serializable {
     private String tableId;
 
     /**
-     * 公告标题
+     * 标题
      */
     @TableField("notice_title")
     private String noticeTitle;
@@ -57,19 +56,19 @@ public class SysNotice implements Serializable {
     private String type;
 
     /**
-     * 消息提醒类型(00:平台欢迎信, 01:发起人审批结果通知, 02:经办人的平台审批结果通知, 03:融资企业经办人融信失效消息通知, 04:融资企业经办人融信生效消息通知)
+     * 消息提醒类型（00:平台欢迎信, 01:发起人审批结果通知, 02:经办人的平台审批结果通知, 03:融资企业经办人融信失效消息通知, 04:融资企业经办人融信生效消息通知, 05:融信即将失效消息通知, 06:还款消息通知）
      */
     @TableField("notice_type")
     private String noticeType;
 
     /**
-     * 待办类型:(00:融信审批待审批, 01:审批拒绝待编辑, 02:核心企业待确权, 03:待盖章, 04:待签收, 05:待融资, 06:待还款)
+     * 待办类型:(00:融信审批待审批, 01:审批拒绝待编辑, 02:核心企业待确权, 03:待盖章, 04:待签收, 05:待融资, 06:待还款, 07:平台内部待办)
      */
     @TableField("work_type")
     private String workType;
 
     /**
-     * 状态（0待办 1已办）
+     * 状态（0待办 1已办 2删除）
      */
     @TableField("status")
     private String status;
@@ -99,6 +98,18 @@ public class SysNotice implements Serializable {
     private String messageStatus;
 
     /**
+     * 打开方式(00:弹窗 01:链接)
+     */
+    @TableField("open_type")
+    private String openType;
+
+    /**
+     * 打开链接
+     */
+    @TableField("open_url")
+    private String openUrl;
+
+    /**
      * 备注
      */
     @TableField("remark")

sc-service/src/main/java/com/huyi/service/base/entity/ZcFinanceLog.java

@@ -0,0 +1,65 @@
+package com.huyi.service.base.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 融信操作日志表
+ * </p>
+ *
+ * @author cuixq
+ * @since 2021-09-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("zc_finance_log")
+public class ZcFinanceLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId("zfl_id")
+    private String zflId;
+
+    /**
+     * 融信ID(zc_finance_inf.zfi_id)
+     */
+    @TableField("zfl_finance_id")
+    private String zflFinanceId;
+
+    /**
+     * 操作内容
+     */
+    @TableField("zfl_content")
+    private String zflContent;
+
+    /**
+     * 操作人员
+     */
+    @TableField("zfl_user_id")
+    private Long zflUserId;
+
+    /**
+     * 操作时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 操作完成后的节点
+     */
+    @TableField("create_node")
+    private String createNode;
+
+
+}

sc-service/src/main/java/com/huyi/service/base/mapper/ZcFinanceLogMapper.java

@@ -0,0 +1,16 @@
+package com.huyi.service.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huyi.service.base.entity.ZcFinanceLog;
+
+/**
+ * <p>
+ * 融信操作日志表 Mapper 接口
+ * </p>
+ *
+ * @author cuixq
+ * @since 2021-09-14
+ */
+public interface ZcFinanceLogMapper extends BaseMapper<ZcFinanceLog> {
+
+}

sc-service/src/main/java/com/huyi/service/base/service/IZcFinanceLogService.java

@@ -0,0 +1,60 @@
+package com.huyi.service.base.service;
+
+import com.huyi.service.base.entity.ZcFinanceLog;
+
+import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+
+
+import java.util.List;
+
+/**
+ * ClassName: IZcFinanceLogService<br>
+ * Description: ZcFinanceLogService接口 <br>
+ * Company: keao
+ *
+ * @author cuixq
+ * @version v1.0.0    2021-09-14  cuixq    由Generator自动创建
+ */
+public interface IZcFinanceLogService extends IService<ZcFinanceLog> {
+    /**
+     * 查询（分页）
+     *
+     * @param request QueryRequest
+     * @param wrapper LambdaQueryWrapper<ZcFinanceLog>
+     * @return IPage<ZcFinanceLog>
+     */
+    IPage<ZcFinanceLog> findZcFinanceLogs(QueryRequest request, LambdaQueryWrapper<ZcFinanceLog> wrapper);
+
+    /**
+     * 查询（所有）
+     *
+     * @param wrapper LambdaQueryWrapper<ZcFinanceLog>
+     * @return List<ZcFinanceLog>
+     */
+    List<ZcFinanceLog> findZcFinanceLogs(LambdaQueryWrapper<ZcFinanceLog> wrapper);
+
+    /**
+     * 新增
+     *
+     * @param zcFinanceLog zcFinanceLog
+     */
+    void createZcFinanceLog(ZcFinanceLog zcFinanceLog);
+
+    /**
+     * 修改
+     *
+     * @param zcFinanceLog zcFinanceLog
+     */
+    void updateZcFinanceLog(ZcFinanceLog zcFinanceLog);
+
+    /**
+     * 删除
+     *
+     * @param wrapper LambdaQueryWrapper<ZcFinanceLog>
+     */
+    void deleteZcFinanceLog(LambdaQueryWrapper<ZcFinanceLog> wrapper);
+}

sc-service/src/main/java/com/huyi/service/base/service/impl/ZcFinanceLogServiceImpl.java

@@ -0,0 +1,64 @@
+package com.huyi.service.base.service.impl;
+
+import com.huyi.service.base.entity.ZcFinanceLog;
+import com.huyi.service.base.mapper.ZcFinanceLogMapper;
+import com.huyi.service.base.service.IZcFinanceLogService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+
+
+import java.util.List;
+
+/**
+ * ClassName: ZcFinanceLogServiceImpl<br>
+ * Description: IZcFinanceLogService实现 <br>
+ * Company: keao
+ *
+ * @author cuixq
+ * @version v1.0.0    2021-09-14  cuixq    由Generator自动创建
+ */
+@Service
+@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
+public class ZcFinanceLogServiceImpl extends ServiceImpl<ZcFinanceLogMapper, ZcFinanceLog> implements IZcFinanceLogService {
+
+    @Autowired
+    private ZcFinanceLogMapper zcFinanceLogMapper;
+
+    @Override
+    public IPage<ZcFinanceLog> findZcFinanceLogs(QueryRequest request, LambdaQueryWrapper<ZcFinanceLog> wrapper) {
+        Page<ZcFinanceLog> page = new Page<>(request.getPageNum(), request.getPageSize());
+        return this.page(page, wrapper);
+    }
+
+    @Override
+    public List<ZcFinanceLog> findZcFinanceLogs(LambdaQueryWrapper<ZcFinanceLog> wrapper) {
+		return this.list(wrapper);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void createZcFinanceLog(ZcFinanceLog zcFinanceLog) {
+        this.save(zcFinanceLog);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateZcFinanceLog(ZcFinanceLog zcFinanceLog) {
+        this.saveOrUpdate(zcFinanceLog);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteZcFinanceLog(LambdaQueryWrapper<ZcFinanceLog> wrapper) {
+	    this.remove(wrapper);
+	}
+}

sc-service/src/main/java/com/huyi/service/common/flowable/controller/FlowableController.java

@@ -141,12 +141,12 @@ public class  FlowableController extends BaseController
             //发送盖章待办
             remoteSystemService.sendNotice(zfiCoreId, id,
                     "核心企业开立审批融信编号为" + zfiNumber + "的资料待盖章，审批发起人为" + userName,
-                    "00",null,"03","0", use.toString(),null);
+                    "00",null,"03","0", use.toString(),null, null, null);
             //向发起人发起最终结果
             //发送人
             remoteSystemService.sendNotice(zfiCoreId, id,
                     "核心企业开立融信编号为" + zfiNumber + "的资料审批已通过",
-                    "01","01",null,"0", userId.toString(), null);
+                    "01","01",null,"0", userId.toString(), null, null, null);
             //核心企业确权审批
         }else if("1000000007".equals(menuId)){
             //融信主键
@@ -173,7 +173,7 @@ public class  FlowableController extends BaseController
             Long use = list.get(0).getSucrUserId();
             remoteSystemService.sendNotice(zfiCoreId, id,
                     "确权审批融信编号为" + zfiNumber + "的资料待盖章，审批发起人为" + userName,
-                    "00",null,"03","0", use.toString(),null);
+                    "00",null,"03","0", use.toString(),null, null, null);
         }
         //融资企业融信申请审批通过
         else if("1000000002".equals(menuId)){
@@ -201,7 +201,7 @@ public class  FlowableController extends BaseController
             String userName = sysUser.getNickName();
             //TODO  发起人最终结果【通过】消息通知
             String title = "【审批通过】由"+ userName +"于"+ createTime +"发起的：融信"+ number +"资料审核已通过，请进行下一步业务操作；";
-            remoteSystemService.sendNotice(company,zfiId,title,"01","01","","0",user.toString(),"");
+            remoteSystemService.sendNotice(company,zfiId,title,"01","01","","0",user.toString(),"", null, null);
             //调用平台审批接口
             Map map = new HashMap();
             //实体类转map
@@ -250,7 +250,7 @@ public class  FlowableController extends BaseController
                 //融信状态(00:待确权 01:待签收 02:已生效 03:已失效 04:融资中 05:已融资 06:平台退回)
 //                financeInf.setZfiStatus("02");
                 //签收日期
-                financeInf.setZfiSignDate(DateUtils.getNowDate());
+//                financeInf.setZfiSignDate(DateUtils.getNowDate());
                 zcFinanceInfService.updateById(financeInf);
                 //TODO 给融资企业经办人生成盖章待办
                 //融资企业Id
@@ -270,7 +270,7 @@ public class  FlowableController extends BaseController
                     user = list.get(0).getSucrUserId();
                 }
                 String title = "【合同签署】由【" + companyName +"】发起的融信【" + zfiNumber + "】资料待签署合同";
-                remoteSystemService.sendNotice(company,zfiId,title,"00","","03","1",user.toString(),"");
+                remoteSystemService.sendNotice(company,zfiId,title,"00","","03","1",user.toString(),"", null, null);
             }
             //TODO 发起人最终结果【通过】消息通知
             //查询发起人,融资企业Id
@@ -287,7 +287,7 @@ public class  FlowableController extends BaseController
             SysUser sysUser = sysUserService.getById(user);
             String userName = sysUser.getNickName();
             String title = "【审批通过】由"+ userName +"于"+ createTime +"发起的：融信"+ number +"资料审核已通过，请进行下一步业务操作；";
-            remoteSystemService.sendNotice(company,zfiId,title,"01","01","","0",user.toString(),"");
+            remoteSystemService.sendNotice(company,zfiId,title,"01","01","","0",user.toString(),"", null, null);
         }//融资企业补充资料审批通过
         else if("1000000003".equals(menuId)){
             LambdaQueryWrapper<ZcFinanceInf> wrapper = new LambdaQueryWrapper<>();
@@ -333,7 +333,7 @@ public class  FlowableController extends BaseController
                 //ToDo 不更改融信状态
 //                financeInf.setZfiStatus("02");
                 //签收日期
-                financeInf.setZfiSignDate(DateUtils.getNowDate());
+//                financeInf.setZfiSignDate(DateUtils.getNowDate());
                 zcFinanceInfService.updateById(financeInf);
                 //TODo 给融资企业经办人生成一条盖章待办
                 /*----------查询供应商企业经办人----------*/
@@ -353,7 +353,7 @@ public class  FlowableController extends BaseController
                 String supplierName = supplierCompany.getScyName();
                 //标题
                 String title = "【合同签署】由【"+supplierName+"】发起的融信【"+zfiNumber+"】资料待签署合同";
-                remoteSystemService.sendNotice(zfiSupplierId, zfiId,title,"00","","03","0",supplierUserId.toString(),"");
+                remoteSystemService.sendNotice(zfiSupplierId, zfiId,title,"00","","03","0",supplierUserId.toString(),"", null, null);
 
             }
         } //平台审批通过
@@ -417,7 +417,7 @@ public class  FlowableController extends BaseController
             else if ("2".equals(zfiCreateType)){
                 //标题
                 String title = "【合同签署】由【"+supplierName+"】发起的融信【"+zfiNumber+"】资料待签署合同";
-                remoteSystemService.sendNotice(zfiSupplierId, zfiId,title,"00","","03","0",supplierUserId.toString(),"");
+                remoteSystemService.sendNotice(zfiSupplierId, zfiId,title,"00","","03","0",supplierUserId.toString(),"", null, null);
             }
             //更新融信表状态
             wrapper.eq(ZcFinanceInf::getZfiId,zfiId);
@@ -425,7 +425,7 @@ public class  FlowableController extends BaseController
             // TODO 不管什么类型都给 融资企业经办人 最终结果【通过】消息通知
             //标题
             String title = "【审批通过】您提交于【"+coreName +"】的融信【"+zfiNumber+"】已审批通过，请进行下一步业务操作";
-            remoteSystemService.sendNotice(zfiSupplierId, zfiId,title,"01","02","","0",supplierUserId.toString(),"");
+            remoteSystemService.sendNotice(zfiSupplierId, zfiId,title,"01","02","","0",supplierUserId.toString(),"", null, null);
 //            if ("2".equals(zfiCreateType)){
 //                Map map = new HashMap();
 //                if (inf != null) {
@@ -455,7 +455,7 @@ public class  FlowableController extends BaseController
             zcFinanceInfService.update(zcfInf,lambdaQueryWrapper);
             //待办标题
             String tittle = "【融资企业签收】由【"+sysCompany.getScyName() +"】发起的融信编号为【"+ id+"】的资料待签署";
-            remoteSystemService.sendNotice(companyId,id,tittle,"00","","03","0",userId,"");
+            remoteSystemService.sendNotice(companyId,id,tittle,"00","","03","0",userId,"", null, null);
             //TODo 给融资企业生成盖章待办
         }
         //融资审批通过
@@ -560,10 +560,10 @@ public class  FlowableController extends BaseController
             SysUser sysUser = sysUserService.getById(user);
             String userName = sysUser.getNickName();
             String title = "【审批拒绝】由"+ userName +"于"+ createTime +"发起的：融信"+ number +"审批被拒绝，拒绝的理由为:"+ reason;
-            remoteSystemService.sendNotice(company,zfiId,title,"01","01","","0",user.toString(),"");
+            remoteSystemService.sendNotice(company,zfiId,title,"01","01","","0",user.toString(),"", null, null);
             //TODO 发起人生成待办
             title = "【内部审批】融信【"+number+"】资料待审批，审批发起人【" + userName +"】";
-            remoteSystemService.sendNotice(company,zfiId,title,"00","","01","0",user.toString(),"");
+            remoteSystemService.sendNotice(company,zfiId,title,"00","","01","0",user.toString(),"", null, null);
         }//融资企业融信开立拒绝
         else if("1000000001".equals(menuId)){
             LambdaQueryWrapper<ZcFinanceInf> lambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -599,7 +599,7 @@ public class  FlowableController extends BaseController
             List list = new ArrayList();
             list.add(user);
             String title = "【审批拒绝】由"+ userName +"于"+ createTime +"发起的：融信"+ number +"审批被拒绝，拒绝的理由为:"+reason;
-            remoteSystemService.sendNotice(company,zfiId,title,"01","01","","0",user.toString(),"");
+            remoteSystemService.sendNotice(company,zfiId,title,"01","01","","0",user.toString(),"", null, null);
         }//融资企业补充资料审批拒绝
         else if("1000000003".equals(menuId)){
             LambdaQueryWrapper<ZcFinanceInf> wrapper = new LambdaQueryWrapper<>();
@@ -662,7 +662,7 @@ public class  FlowableController extends BaseController
             String coreName = coreCompany.getScyName();
             //标题
             String title = "【审批拒绝】您提交于【"+coreName +"】的融信【"+zfiNumber+"】审批被拒绝，拒绝的理由为：【审批意见】";
-            remoteSystemService.sendNotice(zfiSupplierId, zfiId,title,"01","02","","0",supplierUserId.toString(),"");
+            remoteSystemService.sendNotice(zfiSupplierId, zfiId,title,"01","02","","0",supplierUserId.toString(),"", null, null);
         }//融资企业签收审批拒绝
         else if("1000000005".equals(menuId)){
             LambdaQueryWrapper<SysUserCompanyRel> userQueryWrapper = new LambdaQueryWrapper<>();
@@ -680,7 +680,7 @@ public class  FlowableController extends BaseController
             zcFinanceInfService.update(zcFinanceInf,lambdaQueryWrapper);
             //待办标题
             String tittle = "融资企业签收由"+sysCompany.getScyName() +"发起的：融信编号为:"+ id+"的资料代签收";
-            remoteSystemService.sendNotice(companyId,id,tittle,"00",null,"03","0",userId,null);
+            remoteSystemService.sendNotice(companyId,id,tittle,"00",null,"03","0",userId,null, null, null);
             //TODO 给融资企业经办人签收待办
         }//融资审批
         else if("1000000006".equals(menuId)){

sc-service/src/main/java/com/huyi/service/common/flowable/service/impl/ApprovalServiceImpl.java

@@ -125,11 +125,11 @@ public class ApprovalServiceImpl implements ApprovalService {
                 //发送盖章待办
                 remoteSystemService.sendNotice(zfiSupplierId, zfiId,
                         "核心企业开立审批由"+ scyName + "发起的融信编号为" + zfiNumber + "的资料待盖章",
-                        "00",null,"03","0", listUser.get(0).getSucrUserId().toString(),null);
+                        "00",null,"03","0", listUser.get(0).getSucrUserId().toString(),null, null, null);
                 //向发起人发送最终结果【通过】消息通知
                 remoteSystemService.sendNotice(companyId, String.valueOf(userId),
                         "核心企业开立审批融信编号为" + zfiNumber + "的资料审批已通过",
-                        "01","01",null,"0", userId.toString(), null);
+                        "01","01",null,"0", userId.toString(), null, null, null);
             }else if ("450".equals(resMap.get("code"))) {
                 throw new Exception("未配置审批流程");
             }else if (!"200".equals(resMap.get("code"))) {
@@ -231,7 +231,7 @@ public class ApprovalServiceImpl implements ApprovalService {
                 zcFinanceInf.setZfiSignDate(DateUtils.getNowDate());
                 //TODO 融资企业经办人盖章代办
                 String title = "【合同签署】由【"+supplierName+"】发起的融信【"+zfiNumber+"】资料待签署合同";
-                remoteSystemService.sendNotice(zfiSupplierId, zfiId,title,"00","","03","0",supplierUserId.toString(),"");
+                remoteSystemService.sendNotice(zfiSupplierId, zfiId,title,"00","","03","0",supplierUserId.toString(),"", null, null);
                 //查询供应商授信额度表
             }else if ("0".equals(zfiCreateType)){
                 //融信状态(00:待确权 01:待签收 02:已生效 03:已失效 04:融资中 05:已融资 06:平台退回)
@@ -239,14 +239,14 @@ public class ApprovalServiceImpl implements ApprovalService {
                 //TODO 融资企业经办人 最终结果【通过】消息通知
                 //标题
                 String title = "【审批通过】您提交于【"+coreName +"】的融信【"+zfiNumber+"】已审批通过，请进行下一步业务操作";
-                remoteSystemService.sendNotice(zfiSupplierId, zfiId,title,"01","02","","0",supplierUserId.toString(),"");
+                remoteSystemService.sendNotice(zfiSupplierId, zfiId,title,"01","02","","0",supplierUserId.toString(),"", null, null);
                 // TODO 给核心企业经办人确权待办
                 String coreTitle = "【融信确权】由【"+supplierName+"】发起的融信【融信编号:"+zfiNumber+"】【融信金额:"+zfiAmount+"元】资料待确权";
-                remoteSystemService.sendNotice(zfiSupplierId, zfiId,coreTitle,"00","","02","0",coreUserId.toString(),"");
+                remoteSystemService.sendNotice(zfiSupplierId, zfiId,coreTitle,"00","","02","0",coreUserId.toString(),"", null, null);
             }else if ("2".equals(zfiCreateType)){
                 //TODO 融资企业开立时， 给融资企业经办人生成盖章待办
                 String title = "【合同签署】由【"+supplierName+"】发起的融信【"+zfiNumber+"】资料待签署合同";
-                remoteSystemService.sendNotice(zfiSupplierId, zfiId,title,"00","","03","0",supplierUserId.toString(),"");
+                remoteSystemService.sendNotice(zfiSupplierId, zfiId,title,"00","","03","0",supplierUserId.toString(),"", null, null);
             }
             zcFinanceInfService.updateById(zcFinanceInf);
         }else if (!"200".equals(resMap.get("code"))) {
@@ -314,11 +314,11 @@ public class ApprovalServiceImpl implements ApprovalService {
                 longUser.add(user);
                 remoteSystemService.sendNotice(zfiCoreId, zfiId,
                         "确权审批融信编号为" + zfiNumber + "的资料审批已通过",
-                        "01","01",null,"0", user.toString(), null);
+                        "01","01",null,"0", user.toString(), null, null, null);
                 //向核心企业经办人发送盖章待办
                 remoteSystemService.sendNotice(zfiCoreId, zfiId,
                         "确权审批融信编号为" + zfiNumber + "的资料待盖章，审批发起人为" + userName,
-                        "00",null,"03","0", userId.toString(),null);
+                        "00",null,"03","0", userId.toString(),null, null, null);
                 //未配置审批流程
             }else if ("450".equals(resMap.get("code"))) {
                 throw new Exception("未配置审批流程");
@@ -383,7 +383,7 @@ public class ApprovalServiceImpl implements ApprovalService {
             zcFinanceInfService.updateById(zcFinanceInf);
             //待办标题
             String tittle = "【融资企业签收】由【"+sysCompany.getScyName() +"】发起的：融信编号为【"+ CommonUtil.objToString(map.get("zfiNumber"))+"】的资料待签署";
-            remoteSystemService.sendNotice(companyId,CommonUtil.objToString(map.get("zfiId")),tittle,"00",null,"03","0",userId,null);
+            remoteSystemService.sendNotice(companyId,CommonUtil.objToString(map.get("zfiId")),tittle,"00",null,"03","0",userId,null, null, null);
             //TODO 给融资企业经办人盖章待办
         }else if ("450".equals(resMap.get("code"))) {
             throw new Exception("未配置审批流程");
@@ -415,13 +415,13 @@ public class ApprovalServiceImpl implements ApprovalService {
         flowParam.put("menuId", "1000000006");
         flowParam.put("companyId", companyId);
         //双主键
-        flowParam.put("businessKey", CommonUtil.objToString(map.get("zfiId")));
+        flowParam.put("businessKey", CommonUtil.objToString(map.get("zfrId")));
         //员工id
         flowParam.put("sessionUserId",  userId);
         //融信编号
-        String zfiNumber = CommonUtil.objToString(map.get("zfiNumber"));
-        if(CommonUtil.isNotEmpty(zfiNumber)) {
-            flowParam.put("name",userName + DateUtils.getTime() + "发起审批,融信编号为:" + CommonUtil.objToString(map.get("zfiNumber"))+"的融资审批");
+        String zfrId = CommonUtil.objToString(map.get("zfrId"));
+        if(CommonUtil.isNotEmpty(zfrId)) {
+            flowParam.put("name",userName + DateUtils.getTime() + "发起审批,融资编号为:" + zfrId+"的融资审批");
         }else {
             flowParam.put("name",userName + DateUtils.getTime() + "发起融资审批");
         }
@@ -430,7 +430,7 @@ public class ApprovalServiceImpl implements ApprovalService {
         Map<String, Object> resMap = flowableService.apiPost(STRART_FLOW, flowParam);
         if ("200".equals(resMap.get("code"))){
             ZcFinanceInf zfi = new ZcFinanceInf();
-            zfi.setZfiId(CommonUtil.objToString(map.get("zfiId")));
+            zfi.setZfiId(CommonUtil.objToString(map.get("zfrId")));
             //状态(00:待确权 01:待签收 02:已生效 03:已失效 04:融资中 05:已融资 06:平台退回)
             zfi.setZfiStatus("04");
             zcFinanceInfService.updateById(zfi);
@@ -447,12 +447,12 @@ public class ApprovalServiceImpl implements ApprovalService {
         if("300".equals(resMap.get("code"))||"350".equals(resMap.get("code"))){
             ZcFinanceInf zcFinanceInf = new ZcFinanceInf();
             //融信id
-            zcFinanceInf.setZfiId(CommonUtil.objToString(map.get("zfiId")));
+            zcFinanceInf.setZfiId(CommonUtil.objToString(map.get("zfrId")));
             //融信状态(00:待确权 01:待签收 02:已生效 03:已失效 04:融资中 05:已融资 06:平台退回)
             zcFinanceInf.setZfiStatus("04");
             zcFinanceInfService.updateById(zcFinanceInf);
             LambdaQueryWrapper<ZcFinanceRecord> zcFinanceRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
-            zcFinanceRecordLambdaQueryWrapper.eq(ZcFinanceRecord::getZfrFinanceId,CommonUtil.objToString(map.get("zfiId")));
+            zcFinanceRecordLambdaQueryWrapper.eq(ZcFinanceRecord::getZfrFinanceId,CommonUtil.objToString(map.get("zfrId")));
             ZcFinanceRecord zcFinanceRecord = new ZcFinanceRecord();
             //融资状态(00:融资中 01:已放款 02:融资失败 03:已结算)
             zcFinanceRecord.setZfrStatus("00");
@@ -576,7 +576,7 @@ public class ApprovalServiceImpl implements ApprovalService {
                 zcFinanceInfService.updateById(financeInf);
                 //TODO 给融资企业经办人生成一条盖章待办
                 String title = "【合同签署】由【"+supplierName+"】发起的融信【"+zfiNumber+"】资料待签署合同";
-                remoteSystemService.sendNotice(zfiSupplierId, zfiId,title,"00","","03","0",supplierUserId.toString(),"");
+                remoteSystemService.sendNotice(zfiSupplierId, zfiId,title,"00","","03","0",supplierUserId.toString(),"", null, null);
             }
         }else if ("450".equals(resMap.get("code"))){
             throw new Exception("未配置审批流程!");
@@ -716,9 +716,9 @@ public class ApprovalServiceImpl implements ApprovalService {
                 //融资方审批状态(00:审批中, 01:审批通过, 02:审批拒绝, 03:暂存)
                 //financeInf.setZfiSupplierStatus("01");
                 //融信状态(00:待确权 01:待签收 02:已生效 03:已失效 04:融资中 05:已融资 06:平台退回)
-                financeInf.setZfiStatus("00");
-                //签收日期
-                financeInf.setZfiSignDate(DateUtils.getNowDate());
+//                financeInf.setZfiStatus("00");
+                //签收日
+//                financeInf.setZfiSignDate(DateUtils.getNowDate());
                 zcFinanceInfService.updateById(financeInf);
             }
 //            //调用平台审批

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

@@ -0,0 +1,224 @@
+package com.huyi.service.conmany.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huyi.service.base.entity.SysCompany;
+import com.huyi.service.base.entity.SysUser;
+import com.huyi.service.base.entity.SysUserCompanyRel;
+import com.huyi.service.base.service.ISysCompanyService;
+import com.huyi.service.base.service.ISysUserCompanyRelService;
+import com.huyi.service.base.service.ISysUserService;
+import com.huyi.service.conmany.service.IOwnCompanyManageService;
+import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
+import com.tianhu.common.core.domain.R;
+import com.tianhu.common.core.utils.CommonUtil;
+import com.tianhu.common.core.web.controller.BaseController;
+import com.tianhu.common.security.service.TokenService;
+import com.tianhu.system.api.model.LoginUser;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 企业信息Controller
+ *
+ * @author ch
+ * @date 2021-09-14
+ */
+@RestController
+@RequestMapping("/companyInformation")
+public class CompanyInformationController extends BaseController {
+    @Autowired
+    private ISysUserCompanyRelService iSysUserCompanyRelService;
+
+    @Autowired
+    private ISysCompanyService iSysCompanyService;
+
+    @Autowired
+    private IOwnCompanyManageService iOwnCompanyManageService;
+
+    @Autowired
+    private ISysUserService iSysUserService;
+
+    @Autowired
+    private TokenService tokenService;
+
+    /**
+     * 企业四要素认证状态;未认证
+     */
+    private String NORMAL_STATE = "00";
+
+    /**
+     * 是经办人
+     */
+    private String HANDER = "1";
+
+    /**
+     * 获取企业明细信息
+     */
+//    @PreAuthorize(hasPermi = "service:company:query")
+    @GetMapping()
+    public R getCompanyInfo() throws Exception {
+        //获取当前登录用户企业Id
+        String scyId = tokenService.getLoginUser().getSysUser().getCompanyId();
+        LambdaQueryWrapper<SysCompany> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(SysCompany::getScyId,scyId);
+        List<SysCompany> list = iSysCompanyService.findSysCompanys(queryWrapper);
+        //转为MapList
+        List<Map<String, Object>> result = EntityConvertMap(list);
+        if(list.size() > 0) {
+            for(Map r : result) {
+                //联系人
+                Long userId = list.get(0).getScyContractId();
+                //查询联系人信息
+                LambdaQueryWrapper<SysUser> userQuery = new LambdaQueryWrapper<>();
+                userQuery.eq(SysUser::getUserId, userId);
+                List<SysUser> useList = iSysUserService.findSysUsers(userQuery);
+                if(useList.size() > 0) {
+                    //联系电话
+                    String userName = useList.get(0).getUserName();
+                    //联系人
+                    String nickName = useList.get(0).getNickName();
+                    //新增值
+                    r.put("userName", userName);
+                    r.put("nickName", nickName);
+                }
+            }
+            if (NORMAL_STATE.equals(list.get(0).getScyStatus())) {
+                //经办人信息
+                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",result);
+                //经办人信息
+                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);
+            }if (NORMAL_STATE.equals(list.get(0).getScyAuthStatus())) {
+                return R.ok(result);
+            }else if(!NORMAL_STATE.equals(list.get(0).getScyStatus())){
+                return R.ok(result);
+            }
+        }else {
+            throw new Exception("企业不存在");
+        }
+        return R.ok();
+    }
+    /**
+     * 查询链属列表
+     * @param scySocialCode 社会统一信用代码
+     * @param companyName   企业名称
+     * @param scrType       企业类型
+     * @param scrStatus     链属状态
+     * @param request
+     * @return
+     */
+    @GetMapping("/listRel")
+    public R listRel(String scySocialCode, String companyName,
+                     String scrType, String scrStatus, QueryRequest request)
+    {
+        //获取当前操作员
+        LoginUser user = tokenService.getLoginUser();
+        String companyId = user.getSysUser().getCompanyId();
+        Map map = new HashMap();
+        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);
+        }
+        IPage<Map> list = iOwnCompanyManageService.selectCompanyRelList(request,map);
+        return R.ok(list, companyId);
+    }
+    /**
+     * 实体类转Map
+     * @param list
+     * @return
+     */
+    public static  List<Map<String,Object>> EntityConvertMap(List<SysCompany> list){
+        List<Map<String,Object>> l = new LinkedList<>();
+        try {
+            for(SysCompany t : list){
+                Map<String,Object> map = new HashMap<>();
+                Method[] methods = t.getClass().getMethods();
+                for (Method method : methods) {
+                    if (method.getName().startsWith("get")) {
+                        String name = method.getName().substring(3);
+                        name = name.substring(0, 1).toLowerCase() + name.substring(1);
+                        Object value = method.invoke(t);
+                        map.put(name,value);
+                    }
+                }
+                l.add(map);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return l;
+    }
+}

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

@@ -239,7 +239,7 @@ public class CreditHandleController extends BaseController {
             }
             //给融资方经办人添加失效消息
             String title = "【确权失败】您提交于"+coreName+"的【"+zfiNumber+"】,融信金额【"+AmtUtil.moneyFormat(zfiAmount)+"】,(大写:"+bigAmt+"),确权失败，该融信已失效";
-            remoteSystemService.sendNotice(zfiSupplierId,zfiId,title,"01","03","","0",handler,"");
+            remoteSystemService.sendNotice(zfiSupplierId,zfiId,title,"01","03","","0",handler,"", null, null);
 
         }else if("00".equals(flag)){
             //调确权审批
@@ -440,7 +440,7 @@ public class CreditHandleController extends BaseController {
         }
         //核心企业开立时拒签 需要给核心企业经办人失效消息
         String title = "【融信拒签】您提交于"+supplierName+"的【"+zfiNumber+"】,融信金额【"+AmtUtil.moneyFormat(zfiAmount)+"】,(大写:"+bigAmt+"),融信拒签，该融信已失效";
-        remoteSystemService.sendNotice(zfiCoreId,zfiId,title,"01","03","","0",handler,"");
+        remoteSystemService.sendNotice(zfiCoreId,zfiId,title,"01","03","","0",handler,"", null, null);
 
         return AjaxResult.success();
     }

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

@@ -674,7 +674,7 @@ public class OwnMessageController extends BaseController {
                 financeInfService.updateById(finance);
                 //给融资企业经办人添加一条签收待办
                 String title = "【融资签收】您提交于"+openName+"的【"+zfiNumber+"】,融信金额【"+AmtUtil.moneyFormat(zfiAmount)+"】,(大写:"+zfiAmountBig+"),融信待签收";
-                remoteSystemService.sendNotice(zfiSupplierId,zfiId,title,"00","","04","0",supplierHandler,"");
+                remoteSystemService.sendNotice(zfiSupplierId,zfiId,title,"00","","04","0",supplierHandler,"", null, null);
             }else if("02".equals(companyType)){
                 //融资企业
                 //修改融信状态
@@ -685,16 +685,16 @@ public class OwnMessageController extends BaseController {
                 //修改时间
                 finance.setUpdateTime(date);
                 //签收日期
-                financeInf.setZfiSignDate(date);
+                finance.setZfiSignDate(date);
                 //修改人
                 finance.setUpdateBy(userId);
                 financeInfService.updateById(finance);
                 // 融资企业经办人生成一条去融资待办
                 String title = "【融资待办】"+openName+"签发的融信【"+zfiNumber+"】已生效,融信金额【"+AmtUtil.moneyFormat(zfiAmount)+"】,(大写:"+zfiAmountBig+")";
-                remoteSystemService.sendNotice(zfiSupplierId,zfiId,title,"00","","05","0",supplierHandler,"");
+                remoteSystemService.sendNotice(zfiSupplierId,zfiId,title,"00","","05","0",supplierHandler,"", null, null);
                 // 核心企业经办人生成一条已生效消息
                 String  titleName = "【融信生效】您提交于"+receiverName+"的融信【"+zfiNumber+"】,融信金额【"+AmtUtil.moneyFormat(zfiAmount)+"】,(大写:"+zfiAmountBig+")承诺还款日期:"+expireDateA+"融信已生效";
-                remoteSystemService.sendNotice(zfiCoreId,zfiId,titleName,"01","04","","0",coreHandler,"");
+                remoteSystemService.sendNotice(zfiCoreId,zfiId,titleName,"01","04","","0",coreHandler,"", null, null);
             }
 
         }
@@ -721,7 +721,7 @@ public class OwnMessageController extends BaseController {
                 }
                 //给融资企业经办人生成签收待办
                 String title = "【融资签收】您提交于"+openName+"的【"+zfiNumber+"】,融信金额【"+AmtUtil.moneyFormat(zfiAmount)+"】,(大写:"+zfiAmountBig+"),融信待签收";
-                remoteSystemService.sendNotice(zfiSupplierId,zfiId,title,"00","","04","0",supplierHandler,"");
+                remoteSystemService.sendNotice(zfiSupplierId,zfiId,title,"00","","04","0",supplierHandler,"", null, null);
 
             }else if("02".equals(companyType)){
                 //融资企业
@@ -731,7 +731,7 @@ public class OwnMessageController extends BaseController {
                 //已生效
                 finance.setZfiStatus("02");
                 //签收日期
-                financeInf.setZfiSignDate(date);
+                finance.setZfiSignDate(date);
                 //修改时间
                 finance.setUpdateTime(DateUtils.getNowDate());
                 //修改人
@@ -739,7 +739,7 @@ public class OwnMessageController extends BaseController {
                 financeInfService.updateById(finance);
                 //给融资企业生成去融资待办
                 String title = "【融资待办】"+openName+"签发的融信【"+zfiNumber+"】已生效,融信金额【"+AmtUtil.moneyFormat(zfiAmount)+"】,(大写:"+zfiAmountBig+")";
-                remoteSystemService.sendNotice(zfiSupplierId,zfiId,title,"00","","05","0",supplierHandler,"");
+                remoteSystemService.sendNotice(zfiSupplierId,zfiId,title,"00","","05","0",supplierHandler,"", null, null);
             }
 
         }
@@ -754,7 +754,7 @@ public class OwnMessageController extends BaseController {
                 //已生效
                 finance.setZfiStatus("02");
                 //签收日期
-                financeInf.setZfiSignDate(date);
+                finance.setZfiSignDate(date);
                 //修改时间
                 finance.setUpdateTime(DateUtils.getNowDate());
                 //修改人
@@ -762,10 +762,10 @@ public class OwnMessageController extends BaseController {
                 financeInfService.updateById(finance);
                 //给融资企业经办人生成一条去融资待办
                 String title = "【融资待办】"+openName+"签发的融信【"+zfiNumber+"】已生效,融信金额【"+AmtUtil.moneyFormat(zfiAmount)+"】,(大写:"+zfiAmountBig+")";
-                remoteSystemService.sendNotice(zfiSupplierId,zfiId,title,"00","","05","0",supplierHandler,"");
+                remoteSystemService.sendNotice(zfiSupplierId,zfiId,title,"00","","05","0",supplierHandler,"", null, null);
                 //给融资企业经办人生成一条生效消息
                 String  titleName = "【融信生效】您提交于"+openName+"的融信【"+zfiNumber+"】,融信金额【"+AmtUtil.moneyFormat(zfiAmount)+"】,(大写:"+zfiAmountBig+")承诺还款日期:"+expireDateA+"融信已生效";
-                remoteSystemService.sendNotice(zfiSupplierId,zfiId,titleName,"01","04","","0",supplierHandler,"");
+                remoteSystemService.sendNotice(zfiSupplierId,zfiId,titleName,"01","04","","0",supplierHandler,"", null, null);
             }else if("02".equals(companyType)){
                 //融资企业
                 //修改融信状态
@@ -780,7 +780,7 @@ public class OwnMessageController extends BaseController {
                 financeInfService.updateById(finance);
                 //给核心企业经办人生成一条确权待办
                 String  title = "【融信待确权】由"+receiverName+"提交的融信【"+zfiNumber+"】,融信金额【"+AmtUtil.moneyFormat(zfiAmount)+"】,(大写:"+zfiAmountBig+"),融信待确权";
-                remoteSystemService.sendNotice(zfiCoreId,zfiId,title,"00","","02","0",coreHandler,"");
+                remoteSystemService.sendNotice(zfiCoreId,zfiId,title,"00","","02","0",coreHandler,"", null, null);
             }
 
         }

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

@@ -373,6 +373,7 @@ public class FinanceRecordController extends BaseController {
         iZcFinanceInfService.updateZcFinanceInf(zcFinanceInf);
         iZcFinanceRecordService.createZcFinanceRecord(zcFinanceRecord);
         //调用融资审批
+        map.put("zfrId",zfrId);
         approvalService.addFinancingApproval(map);
         return AjaxResult.success();
     }

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

@@ -330,7 +330,7 @@ public class OwnCompanyRelController extends BaseController
         if(CommonUtil.isEmpty(scyName)){
             throw new Exception("企业名称不能为空");
         }
-        String checkScyName = "^[\\u4E00-\\u9FFF0-9A-Z《》()]+$";
+        String checkScyName = "^[\\u4E00-\\u9FFF0-9A-Z《》()（）]+$";
         Pattern regeScyName = Pattern.compile(checkScyName);
         Matcher matcherScyName = regeScyName.matcher(scyName);
         boolean isMatScyName = matcherScyName.matches();

sc-service/src/main/java/com/huyi/service/repayment/controller/repaymentController.java

@@ -7,10 +7,10 @@ import com.deepoove.poi.XWPFTemplate;
 import com.huyi.service.base.entity.*;
 import com.huyi.service.base.service.*;
 import com.huyi.service.repayment.service.IOwnRepaymentService;
-import com.keao.tianhu.core.util.AmtUtil;
 import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
 import com.tianhu.common.core.domain.R;
 import com.tianhu.common.core.utils.CommonUtil;
+import com.tianhu.common.core.utils.ConvertUpMoneyUtil;
 import com.tianhu.common.core.utils.DateUtils;
 import com.tianhu.common.core.utils.file.ExcelFileUtils;
 import com.tianhu.common.core.web.controller.BaseController;
@@ -438,8 +438,8 @@ public class repaymentController extends BaseController {
                 notice.setStatus("2");
                 sysNoticeService.updateSysNotice(notice);
             }
-            String title = "【还款成功】您开立给【"+companyName+"】的一笔【"+amount+"】（大写:"+AmtUtil.convert(amount)+"）的融信【"+ number +"】，已还款成功！";
-            remoteSystemService.sendNotice(company,zfrId,title,"01","07","","0",user,"");
+            String title = "【还款成功】您开立给【"+companyName+"】的一笔【"+amount+"】（大写:"+ ConvertUpMoneyUtil.toChinese(amount)+"）的融信【"+ number +"】，已还款成功！";
+            remoteSystemService.sendNotice(company,zfrId,title,"01","07","","0",user,"", null, null);
         }else {
             LambdaQueryWrapper<SysNotice> lambdaQueryWrapper = new LambdaQueryWrapper<>();
             lambdaQueryWrapper.eq(SysNotice::getTableId,zfrId);
@@ -450,8 +450,8 @@ public class repaymentController extends BaseController {
                 notice.setStatus("2");
                 sysNoticeService.updateSysNotice(notice);
             }
-            String title = "【还款成功】您开立给【"+companyName+"】的一笔【"+amount+"】（大写:"+AmtUtil.convert(amount)+"）的融信【"+ number +"】，已还款成功！";
-            remoteSystemService.sendNotice(coreCompany,zfrId,title,"01","07","","0",handler,"");
+            String title = "【还款成功】您开立给【"+companyName+"】的一笔【"+amount+"】（大写:"+ ConvertUpMoneyUtil.toChinese(amount) +"）的融信【"+ number +"】，已还款成功！";
+            remoteSystemService.sendNotice(coreCompany,zfrId,title,"01","07","","0",handler,"", null, null);
         }
 
     }

sc-service/src/main/resources/mapper/base/SysNoticeMapper.xml

@@ -16,6 +16,8 @@
         <result column="message_id" property="messageId" />
         <result column="message_code" property="messageCode" />
         <result column="message_status" property="messageStatus" />
+        <result column="open_type" property="openType" />
+        <result column="open_url" property="openUrl" />
         <result column="remark" property="remark" />
         <result column="create_time" property="createTime" />
     </resultMap>

sc-service/src/main/resources/mapper/base/ZcFinanceLogMapper.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huyi.service.base.mapper.ZcFinanceLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huyi.service.base.entity.ZcFinanceLog">
+        <id column="zfl_id" property="zflId" />
+        <result column="zfl_finance_id" property="zflFinanceId" />
+        <result column="zfl_content" property="zflContent" />
+        <result column="zfl_user_id" property="zflUserId" />
+        <result column="create_time" property="createTime" />
+        <result column="create_node" property="createNode" />
+    </resultMap>
+
+</mapper>