Merge branch 'lingshan_master' into dev

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/AgentServiceList4WorkPcResultDTO.java

@@ -27,4 +27,6 @@ public class AgentServiceList4WorkPcResultDTO {
     private Date processTime;
 
     private Integer satisfaction;
+
+    private String content;
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/ResiMyCreatedAgentServiceResultDTO.java

@@ -40,4 +40,6 @@ public class ResiMyCreatedAgentServiceResultDTO {
     private Integer processStatus;
 
     private String processStatusName;
+
+    private Integer satisfaction;
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/LingShanAgentServiceController.java

@@ -167,6 +167,24 @@ public class LingShanAgentServiceController {
         return new Result();
     }
 
+    /**
+     * @Description: 删除
+     * @param input:
+     * @Return com.epmet.commons.tools.utils.Result
+     * @Author: wangxianzhang
+     * @Date: 2023/5/10 5:29 PM
+     */
+    @PostMapping("workpc/delete")
+    public Result workPcDelete(@RequestBody Map<String, Object> input) {
+        String id = (String) input.get("id");
+        if (StringUtils.isBlank(id)) {
+            throw new ValidateException("ID为必填项");
+        }
+
+        lingShanServiceAgentService.workPcDelete(id);
+        return new Result();
+    }
+
     /**
      * @Description: pc工作端：服务列表
      * @param orgId:
@@ -194,10 +212,10 @@ public class LingShanAgentServiceController {
         Date processTimeStart = null, processTimeEnd = null;
 
         if (StringUtils.isNotBlank(processTimeStartStr)) {
-            processTimeStart = DateUtils.parse(processTimeStartStr, DateUtils.DATE_TIME_PATTERN);
+            processTimeStart = DateUtils.parse(processTimeStartStr, DateUtils.DATE_PATTERN);
         }
         if (StringUtils.isNotBlank(processTimeEndStr)) {
-            processTimeEnd = DateUtils.parse(processTimeEndStr, DateUtils.DATE_TIME_PATTERN);
+            processTimeEnd = DateUtils.parse(processTimeEndStr, DateUtils.DATE_PATTERN);
         }
 
         PageData<AgentServiceList4WorkPcResultDTO> pd = lingShanServiceAgentService.workPcServiceList(orgId, orgType, serviceCategory, content, agentName,

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/LingShanAgentServiceService.java

@@ -26,4 +26,6 @@ public interface LingShanAgentServiceService {
 
     PageData<AgentServiceList4WorkPcResultDTO> workPcServiceList(String orgId, String orgType, String serviceCategory, String content,
                                                                  String agentName, Date processTimeStart, Date processTimeEnd, Integer pageNo, Integer pageSize);
+
+    void workPcDelete(String id);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java

@@ -129,22 +129,20 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ
             // 执行状态变更校验
             statusChangeCheck(service.getProcessStatus(), processType);
 
-            Date now = new Date();
-
             LingshanAgentServiceRecordEntity e2Update = new LingshanAgentServiceRecordEntity();
             e2Update.setId(id);
             // 处理，处理受理状态和描述，以及处理时间
             e2Update.setProcessStatus(processType);
             e2Update.setProcessDesc(processDesc);
-            e2Update.setProcessTime(now);
             if (LingShanAgentServiceProcessStatusEnum.ACCEPTED.getStatusCode() == processType.intValue()) {
-                // 如果是受理，则记录受理人
+                // 如果是受理，则记录受理人和受理时间
                 LoginUserDetailsResultDTO loginUserDetails = epmetUserRemoteService.getLoginUserDetails();
                 e2Update.setAgentId(loginUserDetails.getUserId());
                 CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(), loginUserDetails.getUserId());
                 if (staffInfo != null) {
                     e2Update.setAgentName(staffInfo.getRealName());
                 }
+                e2Update.setProcessTime(new Date());
             }
 
             agentServiceRecordDao.updateById(e2Update);
@@ -295,16 +293,13 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ
         }
 
         LambdaQueryWrapper<LingshanAgentServiceRecordEntity> q = new LambdaQueryWrapper<>();
-        // q.likeRight(LingshanAgentServiceRecordEntity::getOrgIdPath, orgIdPath);
-        // q.eq(StringUtils.isNotBlank(serviceCategory), LingshanAgentServiceRecordEntity::getServiceCategory, serviceCategory);
-        // q.like(StringUtils.isNotBlank(content), LingshanAgentServiceRecordEntity::getContent, content);
-        // q.like(StringUtils.isNotBlank(agentName), LingshanAgentServiceRecordEntity::getAgentName, agentName);
-        // q.like(StringUtils.isNotBlank(agentName), LingshanAgentServiceRecordEntity::getAgentName, agentName);
-        // q.ge(processTimeStart != null , LingshanAgentServiceRecordEntity::getProcessTime, processTimeStart);
-        // q.le(processTimeStart != null , LingshanAgentServiceRecordEntity::getProcessTime, processTimeEnd);
-
-        // PageHelper.startPage(pageNo, pageSize);
-        List<LingshanAgentServiceRecordEntity> l = agentServiceRecordDao.selectList(q);
+        q.likeRight(LingshanAgentServiceRecordEntity::getOrgIdPath, orgIdPath);
+        q.eq(StringUtils.isNotBlank(serviceCategory), LingshanAgentServiceRecordEntity::getServiceCategory, serviceCategory);
+        q.like(StringUtils.isNotBlank(content), LingshanAgentServiceRecordEntity::getContent, content);
+        q.like(StringUtils.isNotBlank(agentName), LingshanAgentServiceRecordEntity::getAgentName, agentName);
+        q.ge(processTimeStart != null , LingshanAgentServiceRecordEntity::getProcessTime, processTimeStart);
+        q.le(processTimeEnd != null , LingshanAgentServiceRecordEntity::getProcessTime, processTimeEnd);
+
         Page<LingshanAgentServiceRecordEntity> pd = agentServiceRecordDao.selectPage(new Page<>(pageNo, pageSize), q);
 
         List<AgentServiceList4WorkPcResultDTO> ds = pd.getRecords().stream().map(serviceEntity -> {
@@ -316,6 +311,7 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ
 
             AgentServiceList4WorkPcResultDTO d = new AgentServiceList4WorkPcResultDTO();
             d.setId(serviceEntity.getId());
+            d.setContent(serviceEntity.getContent());
             d.setOrgNamePath(getOrgNamePath(serviceEntity.getGridId()));
             d.setServiceCategory(serviceEntity.getServiceCategory());
             d.setServiceCategoryName(categoryName);
@@ -335,6 +331,16 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ
         return new PageData<>(ds, pd.getTotal());
     }
 
+    @Override
+    public void workPcDelete(String id) {
+        LingshanAgentServiceRecordEntity service;
+        if ((service = agentServiceRecordDao.selectById(id)) == null) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), null, "【代办服务】未找到指定的服务信息，ID：" + id);
+        }
+
+        agentServiceRecordDao.deleteById(id);
+    }
+
     /**
      * 通过gridid列表，拼接处组织名称path，例如：开发者社区-Java第一网格，开发者社区-Python第一网格
      */