From f62345115d02710c23772cc345bf1ecfa89faeeb Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期日, 17 三月 2024 10:35:01 +0800
Subject: [PATCH] ERP接口
---
server/dmvisit_admin/src/main/resources/application.yml | 2 +-
server/dmvisit_web/src/main/resources/application.yml | 2 +-
server/openapi/src/main/resources/application.yml | 2 +-
server/dmvisit_admin/src/main/java/com/doumee/api/business/EmpowerController.java | 2 +-
server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java | 4 ++--
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java | 23 +++++++++++------------
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java | 5 ++++-
7 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/EmpowerController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/EmpowerController.java
index 5da9575..b275cdf 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/EmpowerController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/EmpowerController.java
@@ -78,7 +78,7 @@
@PostMapping("/exportExcel")
@RequiresPermissions("business:empower:exportExcel")
public void exportExcel (@RequestBody PageWrap<Empower> pageWrap, HttpServletResponse response) {
- ExcelExporter.build(Empower.class).export(empowerService.findPage(pageWrap).getRecords(), "浜哄憳鎺堟潈瀵煎叆璁板綍", response);
+ ExcelExporter.build(Empower.class).export(empowerService.findPage(pageWrap).getRecords(), "鎺堟潈璁板綍", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java b/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
index 7fa2107..478d293 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
@@ -26,8 +26,8 @@
* @date 2021-10-10 14:40:35
* https://www.bejson.com/othertools/cron/ cron 琛ㄨ揪寮忕敓鎴愬湴鍧�
*/
-//@Component
-//@EnableScheduling
+@Component
+@EnableScheduling
public class ScheduleTool {
@Autowired
diff --git a/server/dmvisit_admin/src/main/resources/application.yml b/server/dmvisit_admin/src/main/resources/application.yml
index e051fda..e7fd5cb 100644
--- a/server/dmvisit_admin/src/main/resources/application.yml
+++ b/server/dmvisit_admin/src/main/resources/application.yml
@@ -10,7 +10,7 @@
# application:
# name: doumeemes
profiles:
- active: testHS
+ active: proHS
# JSON杩斿洖閰嶇疆
jackson:
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
index f71401d..232b0ea 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
@@ -82,59 +82,58 @@
private String companyId;
@ApiModelProperty(value = "濮撳悕")
- @ExcelColumn(name="濮撳悕",index = 1)
+ @ExcelColumn(name="濮撳悕",index = 1,width = 6)
@TableField(exist = false)
private String memberName;
@ApiModelProperty(value = "鎵嬫満鍙�")
- @ExcelColumn(name="鎵嬫満鍙�" ,index = 2)
+ @ExcelColumn(name="鎵嬫満鍙�" ,index = 2,width = 10)
@TableField(exist = false)
private String memberPhone;
@ApiModelProperty(value = "韬唤璇�")
- @ExcelColumn(name="韬唤璇�",index= 3)
+ @ExcelColumn(name="韬唤璇�",index= 3,width = 12)
@TableField(exist = false)
private String memberidCard;
@ApiModelProperty(value = "鎵�灞炲叕鍙�")
- @ExcelColumn(name="鎵�灞炲叕鍙�",index= 4)
+ @ExcelColumn(name="鎵�灞炲叕鍙�",index= 4,width = 12)
@TableField(exist = false)
private String companyName;
@ApiModelProperty(value = "闂ㄧ鏈夋晥鏈熷紑濮�")
- @ExcelColumn(name="闂ㄧ鏈夋晥鏈熷紑濮�",index= 5,dateFormat = "yyyy-MM-dd")
+ @ExcelColumn(name="闂ㄧ鏈夋晥鏈熷紑濮�",index= 5,dateFormat = "yyyy-MM-dd",width = 10)
private Date startTime;
@ApiModelProperty(value = "闂ㄧ鏈夋晥鏈熺粨鏉�", example = "1")
- @ExcelColumn(name="闂ㄧ鏈夋晥鏈熺粨鏉�",index= 6,dateFormat = "yyyy-MM-dd")
+ @ExcelColumn(name="闂ㄧ鏈夋晥鏈熺粨鏉�",index= 6,dateFormat = "yyyy-MM-dd",width = 10)
private Date endTime;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿",index= 7,dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @ExcelColumn(name="鍒涘缓鏃堕棿",index= 7,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 16)
private Date createDate;
@ApiModelProperty(value = "鎿嶄綔浜�")
- @ExcelColumn(name="鎿嶄綔浜�",index= 7)
@TableField(exist = false)
private String createrName;
@ApiModelProperty(value = "鍗＄墖闆嗗悎锛堣嫳鏂囬�楀彿闅斿紑锛�")
private String cardNos;
@ApiModelProperty(value = "涓�鍗￠�氭巿鏉冧笅鍙戠姸鎬� 0寰呬笅鍙� 1浠诲姟鎵ц 2涓嬪彂鎴愬姛 3宸插彇娑� 4涓嬪彂澶辫触 5浠诲姟涓嬭浇宸茬粨鏉� 6涓嶇鍚堜笅鍙戞潯浠� ", example = "1")
- @ExcelColumn(name="涓嬪彂鐘舵��",index= 8,valueMapping ="0=寰呬笅鍙�;1=宸蹭笅鍙�;2=涓嬪彂鎴愬姛;3=宸插彇娑�;4=涓嬪彂澶辫触;5=浠诲姟涓嬭浇宸茬粨鏉�;6==涓嶇鍚堜笅鍙戞潯浠�" )
+ @ExcelColumn(name="涓嬪彂鐘舵��",index= 8,valueMapping ="0=寰呬笅鍙�;1=宸蹭笅鍙�;2=涓嬪彂鎴愬姛;3=宸插彇娑�;4=涓嬪彂澶辫触;5=浠诲姟涓嬭浇宸茬粨鏉�;6==涓嶇鍚堜笅鍙戞潯浠�",width = 10 )
private Integer sendStatus;
@ApiModelProperty(value = "涓嬪彂绫诲瀷 0瀹炴椂 1瀹氭椂 ", example = "1")
- @ExcelColumn(name="涓嬪彂绫诲瀷",index= 9,valueMapping ="0=瀹炴椂;1=瀹氭椂" )
+ @ExcelColumn(name="涓嬪彂绫诲瀷",index= 9,valueMapping ="0=瀹炴椂;1=瀹氭椂",width = 6 )
private Integer sendType;
@ApiModelProperty(value = "涓嬪彂鏃堕棿")
- @ExcelColumn(name="涓嬪彂鏃堕棿",index= 10,dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @ExcelColumn(name="涓嬪彂鏃堕棿",index= 10,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 16)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sendDate;
@ApiModelProperty(value = "涓嬪彂澶囨敞")
- @ExcelColumn(name="涓嬪彂澶囨敞",index= 11)
+ @ExcelColumn(name="涓嬪彂澶囨敞",index= 11,width = 16)
private String sendInfo;
@ApiModelProperty(value = "涓嬪彂寮�濮嬫椂闂�")
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
index ab80e1c..a004435 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitEventServiceImpl.java
@@ -269,7 +269,10 @@
pageWrap.getModel().getKeyWords())
.like(StringUtils.isNotBlank(pageWrap.getModel().getCarNo()),
VisitEvent::getCarNo,
- pageWrap.getModel().getKeyWords())
+ pageWrap.getModel().getCarNo())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getVisitorWorkUint()),
+ VisitEvent::getVisitorWorkUint,
+ pageWrap.getModel().getVisitorWorkUint())
.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),
Company::getName,
pageWrap.getModel().getCompanyName())
diff --git a/server/dmvisit_web/src/main/resources/application.yml b/server/dmvisit_web/src/main/resources/application.yml
index cc7d5b6..789558e 100644
--- a/server/dmvisit_web/src/main/resources/application.yml
+++ b/server/dmvisit_web/src/main/resources/application.yml
@@ -10,7 +10,7 @@
# application:
# name: doumeemes
profiles:
- active: dev
+ active: proHS
# JSON杩斿洖閰嶇疆
jackson:
diff --git a/server/openapi/src/main/resources/application.yml b/server/openapi/src/main/resources/application.yml
index bb74450..52d569b 100644
--- a/server/openapi/src/main/resources/application.yml
+++ b/server/openapi/src/main/resources/application.yml
@@ -10,7 +10,7 @@
# application:
# name: doumeemes
profiles:
- active: testHS
+ active: proHS
# JSON杩斿洖閰嶇疆
jackson:
--
Gitblit v1.9.3