Merge branch 'dev_abandon_grid' of http://git.elinkit.com.cn:7070/r/epmet-cloud into 主线开发

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java

@@ -383,6 +383,6 @@ public interface GovIssueOpenFeignClient {
 	 * @author zxc
 	 * @date 2022/3/15 4:40 下午
 	 */
-	@PostMapping("audit-reset")
+	@PostMapping("/gov/issue/issue/audit-reset")
 	Result<Boolean> issueAuditReset(@RequestParam("gridId")String gridId);
 }

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml

@@ -757,6 +757,7 @@
             COUNT(id)
         FROM issue
         WHERE del_flag = 0
+          and ISSUE_STATUS = 'voting'
           AND grid_id = #{gridId}
     </select>
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java

@@ -38,6 +38,7 @@ import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -1017,12 +1018,12 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
                     StaffOrgRelationEntity entity = new StaffOrgRelationEntity();
                     entity.setId(staffOrg.getId());
                     entity.setOrgType(OrgTypeEnum.AGENCY.getCode());
-                    String pid = CustomerOrgRedis.getGridInfo(staffOrg.getStaffId()).getPid();
-                    if (StringUtils.isBlank(pid)){
-                        log.error("abandonGridForDealBizData agencyId:{} is not exist",pid);
+                    GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(staffOrg.getOrgId());
+                    if (gridInfo == null || StringUtils.isBlank(gridInfo.getPid())){
+                        log.error("abandonGridForDealBizData agencyId:{} is not exist",gridInfo.getPid());
                         return;
                     }
-                    entity.setOrgId(pid);
+                    entity.setOrgId(gridInfo.getPid());
                     updateList.add(entity);
                 }
             });

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java

@@ -156,6 +156,6 @@ public interface GovProjectOpenFeignClient {
 	 * @author zxc
 	 * @date 2022/3/15 5:05 下午
 	 */
-	@PostMapping("audit-reset")
+	@PostMapping("gov/project/project/audit-reset")
 	Result<Boolean> eventAuditReset(@RequestParam("gridId")String gridId);
 }

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml

@@ -536,6 +536,7 @@
         FROM resi_event
         WHERE DEL_FLAG = '0'
           AND `STATUS` = 'processing'
+          AND audit_status  = 'auto_passed'
           AND GRID_ID = #{gridId}
     </select>
 </mapper>