From 484bc1f21e7d29b480005f9c7077b03c64d8f86e Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期六, 22 六月 2024 20:14:11 +0800
Subject: [PATCH] 审批，投诉，报表修改
---
project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java | 2 +-
project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java | 2 +-
project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java | 12 ++++++++++--
project-enforce/src/main/java/com/project/enforce/service/IEnforceOrderService.java | 7 +++++++
project-admin/src/main/java/com/project/ProjectApplication.java | 4 ++--
project-report/src/main/java/com/project/report/service/impl/ReportServiceImpl.java | 2 +-
project-enforce/src/main/java/com/project/enforce/mapper/EnforceOrderMapper.java | 5 +++++
7 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/project-admin/src/main/java/com/project/ProjectApplication.java b/project-admin/src/main/java/com/project/ProjectApplication.java
index 522f52c..b82a92b 100644
--- a/project-admin/src/main/java/com/project/ProjectApplication.java
+++ b/project-admin/src/main/java/com/project/ProjectApplication.java
@@ -16,8 +16,8 @@
{
public static void main(String[] args)
{
- // System.setProperty("spring.devtools.restart.enabled", "false");
+ System.setProperty("spring.devtools.restart.enabled", "false");
SpringApplication.run(ProjectApplication.class, args);
- System.out.println(" ~~ 椤圭洰绠＄悊绯荤粺鍚姩鎴愬姛 ~~ ");
+ System.out.println(" ~~ 銆婃矆涓樻壂鐮佸叆浼併�嬬郴缁熷惎鍔ㄦ垚鍔� ~~ ");
}
}
diff --git a/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java
index cd15977..81c4995 100644
--- a/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java
+++ b/project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java
@@ -164,7 +164,7 @@
@ApiOperation("鎵ф硶鍗曟姇璇�")
@Log(title = "鎵ф硶鍗曟姇璇�", businessType = BusinessType.UPDATE)
@PostMapping("/orderComplaint")
- public AjaxResult orderComplaint(OrderComplaintBo bo)
+ public AjaxResult orderComplaint(@RequestBody OrderComplaintBo bo)
{
return AjaxResult.success(iEnforceOrderService.orderComplaint(bo));
}
diff --git a/project-enforce/src/main/java/com/project/enforce/mapper/EnforceOrderMapper.java b/project-enforce/src/main/java/com/project/enforce/mapper/EnforceOrderMapper.java
index 3c2657c..3a08577 100644
--- a/project-enforce/src/main/java/com/project/enforce/mapper/EnforceOrderMapper.java
+++ b/project-enforce/src/main/java/com/project/enforce/mapper/EnforceOrderMapper.java
@@ -6,6 +6,7 @@
import com.project.enforce.domain.bo.queryBo.OrderCheckedQueryBo;
import com.project.enforce.domain.vo.EnforceOrderVo;
import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
import java.util.List;
@@ -23,4 +24,8 @@
List<EnforceOrderVo> selectScanList(@Param("companyCode") String companyCode,@Param("userId") Long userId);
+
+ @Select("SELECT COUNT(DISTINCT company_id) FROM enforce_order")
+ Integer getDistinctCompanyNum();
+
}
diff --git a/project-enforce/src/main/java/com/project/enforce/service/IEnforceOrderService.java b/project-enforce/src/main/java/com/project/enforce/service/IEnforceOrderService.java
index be219d7..7f05381 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/IEnforceOrderService.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/IEnforceOrderService.java
@@ -142,4 +142,11 @@
* @return 鍒楄〃
*/
List<EnforceOrderVo> queryCommonList(EnforceOrderQueryBo bo);
+
+ /**
+ * 鑾峰彇涓嶅悓浼佷笟id鏁伴噺
+ * @return int
+ */
+ Integer getDistinctCompanyNum();
+
}
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java
index 317241c..cf78f03 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/CheckServiceImpl.java
@@ -43,7 +43,7 @@
@Transactional
public Boolean checkOrder(CheckBo bo)
{
- if (StringUtils.isNotEmpty(bo.getIds())){
+ if (StringUtils.isEmpty(bo.getIds())){
throw new BaseException("璇烽�夋嫨瑕佸鎵圭殑鍗曟嵁锛�");
}
switch (bo.getCheckType())
diff --git a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
index be7bdf0..5497118 100644
--- a/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
+++ b/project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
@@ -53,6 +53,7 @@
private final IEnforceComplaintLogService complaintLogService;
private final IEnforceEvaluateLogService evaluateLogService;
private final YPSmsService smsService;
+ private final EnforceOrderMapper orderMapper;
/**
* 閫氱敤鍒楄〃-鏃犳潈闄�
@@ -65,6 +66,11 @@
QueryWrapper<EnforceOrder> qw = getQw(bo);
List<EnforceOrder> list = this.list(qw);
return Convert.toList(EnforceOrderVo.class , list);
+ }
+
+ @Override
+ public Integer getDistinctCompanyNum() {
+ return orderMapper.getDistinctCompanyNum();
}
/**
@@ -171,12 +177,14 @@
if (one!=null){
String questionStatic = one.getQuestionStatic();
if (StringUtils.isNotEmpty(questionStatic)){
+ EnforceEvaluateVo evaluateVo = Convert.convert(EnforceEvaluateVo.class, one);
try {
- EnforceEvaluateVo evaluateVo = JsonUtils.jsonToPojo(questionStatic, EnforceEvaluateVo.class);
- vo.setEvaluateVo(evaluateVo);
+ List<EnforceEvaluateQuestion> questions = JsonUtils.jsonToList(questionStatic, EnforceEvaluateQuestion.class);
+ evaluateVo.setQuestionList(questions);
} catch (Exception e) {
throw new BaseException("璇勪环闂埜瑙ｆ瀽寮傚父锛�");
}
+ vo.setEvaluateVo(evaluateVo);
}
}
}
diff --git a/project-report/src/main/java/com/project/report/service/impl/ReportServiceImpl.java b/project-report/src/main/java/com/project/report/service/impl/ReportServiceImpl.java
index b02da7c..67d2fad 100644
--- a/project-report/src/main/java/com/project/report/service/impl/ReportServiceImpl.java
+++ b/project-report/src/main/java/com/project/report/service/impl/ReportServiceImpl.java
@@ -51,7 +51,7 @@
public Map<String, Object> getTotalInfo()
{
int companyNum = companyService.count(companyService.lq().eq(SysCompany::getCompanyStatus, 0));
- int enforceCompanyNum = orderService.count(orderService.lq().groupBy(EnforceOrder::getCompanyId));
+ int enforceCompanyNum = orderService.getDistinctCompanyNum();
int enforceDeptNum = deptService.count(deptService.lq().eq(SysDept::getParentId,100));
int enforceUserNum = userService.count(userService.lq().ne(SysUser::getUserType,"02"));
int enforceOrderNum = orderService.count();
--
Gitblit v1.9.1