From d2590e4f4f561fd8136c5ce1ad2b3fb972e5270d Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Tue, 30 Jul 2024 13:31:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E5=AE=9A=E7=82=B9=E5=AE=A2=E6=88=B7=E5=A4=87=E6=A1=88?=
 =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CrmMaintenanceenterprisePersonMapper.java             | 4 ++--
 .../CrmMaintenanceenterpriseRecordMapper.xml              | 4 ++--
 .../CrmMaintenanceenterpriseRecordService.java            | 8 ++++++++
 .../CrmMaintenanceenterpriseVehMapper.java                | 4 ++--
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonMapper.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonMapper.java
index 3b087c95c7..3368a72f6b 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonMapper.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonMapper.java
@@ -66,9 +66,9 @@ public interface CrmMaintenanceenterprisePersonMapper extends BaseMapper<CrmMain
 	@Select("select * from crm_maintenanceenterprise_person")
 	List<CrmMaintenanceenterprisePersonVo> selectListVo();
 
-	@Delete("delete from crm_maintenanceenterprise_person where billSid = sid")
+	@Delete("delete from crm_maintenanceenterprise_person where billSid = #{sid}")
 	void delByBillSid(String sid);
-	@Select("select * from crm_maintenanceenterprise_person where billSid = sid ")
+	@Select("select * from crm_maintenanceenterprise_person where billSid = #{sid} ")
 	List<CrmMaintenanceenterprisePerson> selByBillSid(String sid);
 
 	@Select("select * from crm_maintenanceenterprise_person where billSid = #{sid}")
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.xml
index 8e791fd5ac..44fedd5b90 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.xml
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.xml
@@ -29,9 +29,9 @@
 		CASE
 
 		WHEN r.filingIndate >= NOW() THEN
-		'1'
+		'0'
 		WHEN r.filingIndate &lt; NOW() THEN
-		'0' ELSE '0'
+		'1' ELSE '1'
 		END AS isFilingIndate,
 		s.orgSidPath
 		FROM
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java
index 5e4d7c5fe5..5bbab40c1d 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java
@@ -215,6 +215,7 @@ public class CrmMaintenanceenterpriseRecordService extends MybatisBaseService<Cr
             for (CarListVo carListVo : carList) {
                 CrmMaintenanceenterpriseVeh veh = new CrmMaintenanceenterpriseVeh();
                 BeanUtil.copyProperties(carListVo, veh, "id", "sid");
+                veh.setBillSid(sid);
                 crmMaintenanceenterpriseVehService.insert(veh);
             }
         }
@@ -223,6 +224,7 @@ public class CrmMaintenanceenterpriseRecordService extends MybatisBaseService<Cr
             for (PersonListVo personListVo : personListVos) {
                 CrmMaintenanceenterprisePerson person = new CrmMaintenanceenterprisePerson();
                 BeanUtil.copyProperties(personListVo, person, "id", "sid");
+                person.setBillSid(sid);
                 crmMaintenanceenterprisePersonService.insert(person);
             }
         }
@@ -295,6 +297,9 @@ public class CrmMaintenanceenterpriseRecordService extends MybatisBaseService<Cr
                 vo.setInstanceId(entity.getProcInstId());
             }
             vo.setCreateTime(DateUtil.formatDate(entity.getCreateTime()));
+            if (null != entity.getFilingIndate()) {
+                vo.setFilingIndate(DateUtil.formatDate(entity.getFilingIndate()));
+            }
             CrmCustomerTemp customerTemp = crmCustomerTempService.fetchBySid(entity.getCustomerSid());
             if (null != customerTemp) {
                 if (StringUtils.isNotBlank(customerTemp.getAddress())) {
@@ -360,6 +365,9 @@ public class CrmMaintenanceenterpriseRecordService extends MybatisBaseService<Cr
                 for (CrmMaintenanceenterpriseVeh veh : vehList) {
                     CarListVo carListVo = new CarListVo();
                     BeanUtil.copyProperties(veh, carListVo);
+                    if (null != veh.getBuyDate()) {
+                        carListVo.setBuyDate(DateUtil.formatDate(veh.getBuyDate()));
+                    }
                     carListVos.add(carListVo);
                 }
                 vo.setCarList(carListVos);
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehMapper.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehMapper.java
index f88756d37b..3dae25b19a 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehMapper.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseveh/CrmMaintenanceenterpriseVehMapper.java
@@ -64,8 +64,8 @@ public interface CrmMaintenanceenterpriseVehMapper extends BaseMapper<CrmMainten
 	@Select("select * from crm_maintenanceenterprise_veh")
 	List<CrmMaintenanceenterpriseVehVo> selectListVo();
 
-	@Delete("delete from crm_maintenanceenterprise_veh where billSid = sid")
+	@Delete("delete from crm_maintenanceenterprise_veh where billSid = #{sid}")
     void delByBillSid(String sid);
-	@Select("select * from crm_maintenanceenterprise_veh where billSid = sid ")
+	@Select("select * from crm_maintenanceenterprise_veh where billSid = #{sid} ")
 	List<CrmMaintenanceenterpriseVeh> selByBillSid(String sid);
 }