Merge branch 'lingshan_master' into dev

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/LingShanServiceAgentController.java

@@ -33,11 +33,11 @@ public class LingShanServiceAgentController {
     @GetMapping("workpc/agentList")
     public Result<PageData<LingshanServiceAgentAgentList>> workPcAgentList(@RequestParam("pageNo") Integer pageNo,
                                                                            @RequestParam("pageSize") Integer pageSize,
-                                                                           @RequestParam("orgId") String orgId,
-                                                                           @RequestParam("orgType") String orgType,
-                                                                           @RequestParam("agentName") String agentName,
-                                                                           @RequestParam("mobile") Integer mobile,
-                                                                           @RequestParam("idCard") Integer idCard) {
+                                                                           @RequestParam(value = "orgId", required = false) String orgId,
+                                                                           @RequestParam(value = "orgType", required = false) String orgType,
+                                                                           @RequestParam(value = "agentName",required = false) String agentName,
+                                                                           @RequestParam(value = "mobile", required = false) Integer mobile,
+                                                                           @RequestParam(value = "idCard", required = false) Integer idCard) {
 
         PageData<LingshanServiceAgentAgentList> pd = lingShanServiceAgentService.workPcAgentList(orgId, orgType, agentName, mobile, idCard, pageNo, pageSize);
         return new Result<PageData<LingshanServiceAgentAgentList>>().ok(pd);

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/LingShanServiceAgentServiceImpl.java

@@ -19,8 +19,11 @@ import com.epmet.dataaggre.service.LingShanServiceAgentService;
 import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
 import com.epmet.dataaggre.service.govorg.GovOrgService;
 import com.epmet.dto.SysDictDataDTO;
+import com.epmet.dto.result.LoginUserDetailsResultDTO;
 import com.epmet.feign.EpmetAdminOpenFeignClient;
+import com.epmet.remote.EpmetUserRemoteService;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -40,6 +43,9 @@ public class LingShanServiceAgentServiceImpl implements LingShanServiceAgentServ
     @Autowired
     private EpmetAdminOpenFeignClient adminOpenFeignClient;
 
+    @Autowired
+    private EpmetUserRemoteService epmetUserRemoteService;
+
     @Override
     public PageData<LingshanServiceAgentAgentList> workPcAgentList(String orgId, String orgType, String agentName, Integer mobile, Integer idCard,
                                                                    Integer pageNo, Integer pageSize) {
@@ -48,6 +54,13 @@ public class LingShanServiceAgentServiceImpl implements LingShanServiceAgentServ
         Map<String, List<String>> staffIdAndGridIds = new HashMap<>();
         Set<String> staffIds = new HashSet<>();
 
+        if (StringUtils.isAnyBlank(orgId, orgType)) {
+            // 如果前端没选择，那就取当前工作人员所属组织
+            LoginUserDetailsResultDTO loginUserDetails = epmetUserRemoteService.getLoginUserDetails();
+            orgId = loginUserDetails.getAgencyId();
+            orgType = OrgInfoConstant.AGENCY;
+        }
+
         // 得到staffIds和staffIdAndGridIds
         if (OrgInfoConstant.AGENCY.equals(orgType)) {
             // agency

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

@@ -151,8 +151,8 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ
                 if (staffInfo != null) {
                     e2Update.setAgentName(staffInfo.getRealName());
                 }
-                e2Update.setProcessTime(new Date());
             }
+            e2Update.setProcessTime(new Date());
 
             agentServiceRecordDao.updateById(e2Update);
         } catch (Exception e) {
@@ -246,6 +246,7 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ
             LingshanAgentServiceRecordEntity e2update = new LingshanAgentServiceRecordEntity();
             e2update.setId(id);
             e2update.setProcessStatus(LingShanAgentServiceProcessStatusEnum.WITHDRAW.getStatusCode());
+            e2update.setProcessTime(new Date());
             agentServiceRecordDao.updateById(e2update);
         } catch (Exception e) {
             log.error("【待办服务】撤回：分布式锁错误:" + ExceptionUtils.getErrorStackTrace(e));
@@ -329,8 +330,9 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ
             d.setAgentName(serviceEntity.getAgentName());
             d.setProcessStatus(serviceEntity.getProcessStatus());
             d.setProcessStatusDisplay(LingShanAgentServiceProcessStatusEnum.getByStatus(serviceEntity.getProcessStatus()).getStatusName());
-            if (!(LingShanAgentServiceProcessStatusEnum.REJECTED.getStatusCode() == serviceEntity.getProcessStatus().intValue())) {
-                // 驳回的话，不显示处理时间；受理、办结状态显示；待受理还没有处理时间
+            if (LingShanAgentServiceProcessStatusEnum.ACCEPTED.getStatusCode() == serviceEntity.getProcessStatus().intValue()
+                || LingShanAgentServiceProcessStatusEnum.CLOSED.getStatusCode() == serviceEntity.getProcessStatus().intValue()) {
+                // 只有已受理和驳回才显示这个时间。
                 d.setProcessTime(serviceEntity.getProcessTime());
             }
             d.setSatisfaction(serviceEntity.getSatisfication());