From 69b75768f46fcadf8c6442a1790ecbb0bb019304 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Sat, 17 Sep 2022 10:50:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9A=84=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yxt/anrui/base/api/commoncontract/CommonContract.java   | 2 ++
 .../base/biz/commoncontract/CommonContractService.java      | 6 +++++-
 .../java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.xml | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java
index 372dccf60d..a4c330bcf2 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java
@@ -111,4 +111,6 @@ public class CommonContract extends BaseEntity {
     private String taskId;
     @ApiModelProperty("生成的合同的url")
     private String commonContractUrl;
+
+    private String configSid;
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
index 73111fa471..2832d24a98 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
@@ -1402,8 +1402,11 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                     commonContract.setPartyA(createOrgName);
                     commonContract.setPartyB(customerName);
                     //签订日期、签订地点
-                    //订金、合同金额
+                    commonContract.setCreateDate(new Date());
+                    commonContract.setAddress("");
+                    //订金
                     commonContract.setDeposit(new BigDecimal(depositTotal));
+                    //合同金额
                     commonContract.setContractAmount(depositTotal);
                     //合同附件
                     //身份证信息附件
@@ -1411,6 +1414,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                     commonContract.setModelSid(appOrderModelInfoVo.getModelSid());
                     //车型名称
                     commonContract.setModelName(appOrderModelInfoVo.getModelName());
+                    commonContract.setConfigSid(appOrderModelInfoVo.getConfigSid());
                     //车辆台数
                     commonContract.setNum(Integer.valueOf(num).intValue());
                     //车辆单价
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.xml
index 012ed2ae0b..85eac117c7 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.xml
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrole/SysRoleMapper.xml
@@ -79,7 +79,7 @@
     </select>
 
     <select id="selectByUserSid" resultType="java.lang.String">
-        select GROUP_CONCAT(sr.name SEPARATOR '/') as roleName
+        select GROUP_CONCAT(sr.name SEPARATOR '|') as roleName
         from sys_user_role sur
                  left join sys_role sr on sur.roleSid = sr.sid
         where sur.userSid = #{sid}