From cab3425bb92d01f3494eb25c1f299038dc634c65 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 15 三月 2023 23:43:48 +0800
Subject: [PATCH] 优化保养转单功能
---
service-user/src/main/java/com/java110/user/api/ActivitiesRuleApi.java | 44 ++++++++++++++++++++------------------------
1 files changed, 20 insertions(+), 24 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/api/ActivitiesRuleApi.java b/service-user/src/main/java/com/java110/user/api/ActivitiesRuleApi.java
old mode 100644
new mode 100755
index 542754c..5e5335e
--- a/service-user/src/main/java/com/java110/user/api/ActivitiesRuleApi.java
+++ b/service-user/src/main/java/com/java110/user/api/ActivitiesRuleApi.java
@@ -31,8 +31,10 @@
@Autowired
private ISaveActivitiesRuleBMO saveActivitiesRuleBMOImpl;
+
@Autowired
private IUpdateActivitiesRuleBMO updateActivitiesRuleBMOImpl;
+
@Autowired
private IDeleteActivitiesRuleBMO deleteActivitiesRuleBMOImpl;
@@ -41,8 +43,10 @@
@Autowired
private ISaveActivitiesBeautifulStaffBMO saveActivitiesBeautifulStaffBMOImpl;
+
@Autowired
private IUpdateActivitiesBeautifulStaffBMO updateActivitiesBeautifulStaffBMOImpl;
+
@Autowired
private IDeleteActivitiesBeautifulStaffBMO deleteActivitiesBeautifulStaffBMOImpl;
@@ -62,17 +66,13 @@
public ResponseEntity<String> saveActivitiesRule(
@RequestHeader(value = "store-id", required = false) String storeId,
@RequestBody JSONObject reqJson) {
-
Assert.hasKeyAndValue(reqJson, "ruleName", "璇锋眰鎶ユ枃涓湭鍖呭惈ruleName");
Assert.hasKeyAndValue(reqJson, "ruleType", "璇锋眰鎶ユ枃涓湭鍖呭惈ruleType");
Assert.hasKeyAndValue(reqJson, "startTime", "璇锋眰鎶ユ枃涓湭鍖呭惈startTime");
Assert.hasKeyAndValue(reqJson, "endTime", "璇锋眰鎶ユ枃涓湭鍖呭惈endTime");
Assert.hasKeyAndValue(reqJson, "activitiesObj", "璇锋眰鎶ユ枃涓湭鍖呭惈activitiesObj");
Assert.hasKeyAndValue(reqJson, "remark", "璇锋眰鎶ユ枃涓湭鍖呭惈remark");
-
String activitiesObj = reqJson.getString("activitiesObj");
-
-
ActivitiesRulePo activitiesRulePo = BeanConvertUtil.covertBean(reqJson, ActivitiesRulePo.class);
if ("4444".equals(activitiesObj)) {
activitiesRulePo.setObjType(QuestionAnswerDto.QA_TYPE_STORE);
@@ -95,7 +95,6 @@
*/
@RequestMapping(value = "/updateActivitiesRule", method = RequestMethod.POST)
public ResponseEntity<String> updateActivitiesRule(@RequestBody JSONObject reqJson) {
-
Assert.hasKeyAndValue(reqJson, "ruleName", "璇锋眰鎶ユ枃涓湭鍖呭惈ruleName");
Assert.hasKeyAndValue(reqJson, "ruleType", "璇锋眰鎶ユ枃涓湭鍖呭惈ruleType");
Assert.hasKeyAndValue(reqJson, "startTime", "璇锋眰鎶ユ枃涓湭鍖呭惈startTime");
@@ -103,8 +102,6 @@
Assert.hasKeyAndValue(reqJson, "activitiesObj", "璇锋眰鎶ユ枃涓湭鍖呭惈activitiesObj");
Assert.hasKeyAndValue(reqJson, "remark", "璇锋眰鎶ユ枃涓湭鍖呭惈remark");
Assert.hasKeyAndValue(reqJson, "ruleId", "ruleId涓嶈兘涓虹┖");
-
-
ActivitiesRulePo activitiesRulePo = BeanConvertUtil.covertBean(reqJson, ActivitiesRulePo.class);
return updateActivitiesRuleBMOImpl.update(activitiesRulePo);
}
@@ -120,10 +117,7 @@
@RequestMapping(value = "/deleteActivitiesRule", method = RequestMethod.POST)
public ResponseEntity<String> deleteActivitiesRule(@RequestBody JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "communityId", "灏忓尯ID涓嶈兘涓虹┖");
-
Assert.hasKeyAndValue(reqJson, "ruleId", "ruleId涓嶈兘涓虹┖");
-
-
ActivitiesRulePo activitiesRulePo = BeanConvertUtil.covertBean(reqJson, ActivitiesRulePo.class);
return deleteActivitiesRuleBMOImpl.delete(activitiesRulePo);
}
@@ -137,12 +131,17 @@
* @path /app/activitiesRule/queryActivitiesRule
*/
@RequestMapping(value = "/queryActivitiesRule", method = RequestMethod.GET)
- public ResponseEntity<String> queryActivitiesRule(
- @RequestHeader(value = "store-id", required = false) String storeId,
- @RequestParam(value = "communityId") String communityId,
- @RequestParam(value = "page") int page,
- @RequestParam(value = "row") int row) {
+ public ResponseEntity<String> queryActivitiesRule(@RequestHeader(value = "store-id", required = false) String storeId,
+ @RequestParam(value = "ruleType", required = false) String ruleType,
+ @RequestParam(value = "ruleName", required = false) String ruleName,
+ @RequestParam(value = "activitiesObj", required = false) String activitiesObj,
+ @RequestParam(value = "communityId") String communityId,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
ActivitiesRuleDto activitiesRuleDto = new ActivitiesRuleDto();
+ activitiesRuleDto.setRuleType(ruleType);
+ activitiesRuleDto.setRuleName(ruleName);
+ activitiesRuleDto.setActivitiesObj(activitiesObj);
activitiesRuleDto.setPage(page);
activitiesRuleDto.setRow(row);
activitiesRuleDto.setObjIds(new String[]{storeId, communityId});
@@ -162,13 +161,10 @@
public ResponseEntity<String> saveActivitiesBeautifulStaff(
@RequestHeader(value = "store-id") String storeId,
@RequestBody JSONObject reqJson) {
-
Assert.hasKeyAndValue(reqJson, "staffId", "璇锋眰鎶ユ枃涓湭鍖呭惈staffId");
Assert.hasKeyAndValue(reqJson, "activitiesNum", "璇锋眰鎶ユ枃涓湭鍖呭惈activitiesNum");
Assert.hasKeyAndValue(reqJson, "workContent", "璇锋眰鎶ユ枃涓湭鍖呭惈workContent");
Assert.hasKeyAndValue(reqJson, "ruleId", "璇锋眰鎶ユ枃涓湭鍖呭惈ruleId");
-
-
ActivitiesBeautifulStaffPo activitiesBeautifulStaffPo = BeanConvertUtil.covertBean(reqJson, ActivitiesBeautifulStaffPo.class);
activitiesBeautifulStaffPo.setStoreId(storeId);
return saveActivitiesBeautifulStaffBMOImpl.save(activitiesBeautifulStaffPo);
@@ -184,14 +180,11 @@
*/
@RequestMapping(value = "/updateActivitiesBeautifulStaff", method = RequestMethod.POST)
public ResponseEntity<String> updateActivitiesBeautifulStaff(@RequestBody JSONObject reqJson) {
-
Assert.hasKeyAndValue(reqJson, "staffId", "璇锋眰鎶ユ枃涓湭鍖呭惈staffId");
Assert.hasKeyAndValue(reqJson, "activitiesNum", "璇锋眰鎶ユ枃涓湭鍖呭惈activitiesNum");
Assert.hasKeyAndValue(reqJson, "workContent", "璇锋眰鎶ユ枃涓湭鍖呭惈workContent");
Assert.hasKeyAndValue(reqJson, "ruleId", "璇锋眰鎶ユ枃涓湭鍖呭惈ruleId");
Assert.hasKeyAndValue(reqJson, "beId", "beId涓嶈兘涓虹┖");
-
-
ActivitiesBeautifulStaffPo activitiesBeautifulStaffPo = BeanConvertUtil.covertBean(reqJson, ActivitiesBeautifulStaffPo.class);
return updateActivitiesBeautifulStaffBMOImpl.update(activitiesBeautifulStaffPo);
}
@@ -207,10 +200,7 @@
@RequestMapping(value = "/deleteActivitiesBeautifulStaff", method = RequestMethod.POST)
public ResponseEntity<String> deleteActivitiesBeautifulStaff(@RequestBody JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "communityId", "灏忓尯ID涓嶈兘涓虹┖");
-
Assert.hasKeyAndValue(reqJson, "beId", "beId涓嶈兘涓虹┖");
-
-
ActivitiesBeautifulStaffPo activitiesBeautifulStaffPo = BeanConvertUtil.covertBean(reqJson, ActivitiesBeautifulStaffPo.class);
return deleteActivitiesBeautifulStaffBMOImpl.delete(activitiesBeautifulStaffPo);
}
@@ -225,9 +215,15 @@
*/
@RequestMapping(value = "/queryActivitiesBeautifulStaff", method = RequestMethod.GET)
public ResponseEntity<String> queryActivitiesBeautifulStaff(@RequestHeader(value = "store-id", required = false) String storeId,
+ @RequestParam(value = "ruleId", required = false) String ruleId,
+ @RequestParam(value = "activitiesNum", required = false) String activitiesNum,
+ @RequestParam(value = "staffName", required = false) String staffName,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
ActivitiesBeautifulStaffDto activitiesBeautifulStaffDto = new ActivitiesBeautifulStaffDto();
+ activitiesBeautifulStaffDto.setStaffName(staffName);
+ activitiesBeautifulStaffDto.setRuleId(ruleId);
+ activitiesBeautifulStaffDto.setActivitiesNum(activitiesNum);
activitiesBeautifulStaffDto.setPage(page);
activitiesBeautifulStaffDto.setRow(row);
activitiesBeautifulStaffDto.setStoreId(storeId);
--
Gitblit v1.8.0