Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/impl/LatentDangerServiceImpl.java

@@ -2149,7 +2149,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
 							finalBuildingAbsolutePositionMap.get(danger.getStructureId().toString()).toString());
 				}
 				LatentDangerBizTypeEnum bizTypeEnum = LatentDangerBizTypeEnum.getByCode(danger.getBizType());
-				if (bizType.equals(danger.getBizType())) {
+				if (bizType.equals(danger.getBizType()) && !"draft".equals(danger.getDangerState())) {
 					LatentDangerState.SupervisionDangerStateEnum dangerStateEnum = LatentDangerState.SupervisionDangerStateEnum
 							.getEnumByCode(danger.getDangerState());
 					danger.setProcessState(dangerStateEnum.getProcessState());

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PlanAuditServiceImpl.java

@@ -9,6 +9,7 @@ import com.yeejoin.amos.supervision.business.dao.repository.IPlanAuditLogDao;
 import com.yeejoin.amos.supervision.business.dao.repository.IPlanDao;
 import com.yeejoin.amos.supervision.business.feign.JCSFeignClient;
 import com.yeejoin.amos.supervision.business.service.intfc.IPlanAuditService;
+import com.yeejoin.amos.supervision.business.service.intfc.IPlanTaskService;
 import com.yeejoin.amos.supervision.common.enums.CheckTypeSuEnum;
 import com.yeejoin.amos.supervision.common.enums.DangerCheckTypeLevelEnum;
 import com.yeejoin.amos.supervision.common.enums.PlanStatusEnum;
@@ -52,7 +53,8 @@ public class PlanAuditServiceImpl implements IPlanAuditService {
 
     @Autowired
     JCSFeignClient jcsFeignClient;
-
+    @Autowired
+    IPlanTaskService planTaskService;
     @Override
     @Transactional
     public Boolean auditWorkFlow(PlanAuditLog planAuditLog, Integer status, String condition, ReginParams reginParams) throws Exception {
@@ -84,6 +86,9 @@ public class PlanAuditServiceImpl implements IPlanAuditService {
                 planAuditLog.setFlowJson(condition);
                 planAuditLog.setRoleName(roleName);
                 planAuditLogDao.save(planAuditLog);
+                if("导入外部监查隐患".equals(planAuditLog.getFlowTaskName())) {
+                	planTaskService.taskExecutionImportPlan(planAuditLog.getPlanId());
+                }
                 planService.getUserIdsByWorkflow(plan, instanceId, status, planAuditLog.getExcuteState());
                 return Boolean.TRUE;
             }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PlanTaskServiceImpl.java

@@ -431,20 +431,20 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void taskExecutionImportPlan(List<Plan> planList) {
+	public Boolean taskExecutionImportPlan(Long id) {
+		Optional<Plan> planList = iplanDao.findById(id);
+		Plan plan=planList.get();
 		Date now = new Date();// 今天
 		SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
-		String strDate = df.format(now);
 		String tomorrow = DateUtil.getIntervalDateStr(now, 1, "yyyy-MM-dd");// 下一天
-		if (planList == null || planList.size() <= 0) {
+		if (planList == null ) {
 			log.info(" 暂无待生成执行数据的计划");
-			return;
+			return false;
 		}
 		// 2.循环遍历执行
 		HashMap<String, Object> paramMap = new HashMap<String, Object>();
-		for (Plan plan : planList) {
 			if (StringUtils.isEmpty(plan.getUserId()))
-				continue;
+				return false;
 			paramMap.clear();
 			paramMap.put("id", plan.getId());
 			// 2.1计划数据合法性校验
@@ -452,7 +452,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
 			if (!fileFlag) {
 				paramMap.put("next_gen_date", tomorrow);
 				planMapper.updPlanStatusOrGenDate(paramMap);// 更新为明天
-				continue;
+				return true;
 			}
 			// 2.2.计算生成数据的日期区间
 			CalDateVo vo = PlanTaskUtil.reGenPlanTaskData(plan, tomorrow, tomorrow);
@@ -461,13 +461,13 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
 			if (null == vo) {
 				paramMap.put("next_gen_date", tomorrow);
 				planMapper.updPlanStatusOrGenDate(paramMap);// 更新为明天
-				continue;
+				return true;
 			}
 			// 计划已过期,则更新status = 7,已完成
 			if (!vo.getIsGenData()) {
 				paramMap.put("status", PlanStatusEnum.COMPLETED.getValue());
 				planMapper.updPlanStatusOrGenDate(paramMap);
-				continue;
+				return true;
 			}
 
 			// 2.3.执行数据生成（具体时间 + 人员）
@@ -476,11 +476,11 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
 			if (XJConstant.UPD_PLAN_GEN_DATE.equals(vo.getUpdFlag())) {
 				paramMap.put("next_gen_date", tomorrow);
 				planMapper.updPlanStatusOrGenDate(paramMap);// 更新为明天
-				continue;
+				return true;
 			} else if (XJConstant.UPD_PLAN_STATUS.equals(vo.getUpdFlag())) {
 				paramMap.put("status", XJConstant.PLAN_STATUS_STOP);
 				planMapper.updPlanStatusOrGenDate(paramMap);// 更新status = 1,停用
-				continue;
+				return true;
 			}
 
 			// 2.4.删除今天可能重做生成的数据（计划重做后进行了计划的编辑）
@@ -489,10 +489,9 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
 				if (iplanTaskDao.existsById(plan.getPlanTaskId())) {
 					iplanTaskDao.deleteById(plan.getPlanTaskId());
 				}
-
 			// 2.5.插入planTask及planTaskDetail
 			insertPlanTaskAndDet(list, plan, XJConstant.SCHED_FLAG, now);
-		}
+			return true;
 	}
 
 	/**

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/intfc/IPlanTaskService.java

@@ -5,18 +5,16 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.springframework.data.domain.Page;
+
 import com.yeejoin.amos.supervision.business.entity.mybatis.CheckChkExListBo;
+import com.yeejoin.amos.supervision.business.param.CheckPtListPageParam;
+import com.yeejoin.amos.supervision.business.param.PlanTaskPageParam;
 import com.yeejoin.amos.supervision.business.vo.CodeOrderVo;
 import com.yeejoin.amos.supervision.business.vo.LeavePlanTaskVo;
 import com.yeejoin.amos.supervision.business.vo.PlanTaskVo;
 import com.yeejoin.amos.supervision.core.common.request.CommonPageable;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.data.domain.Page;
-
-import com.yeejoin.amos.supervision.business.param.CheckPtListPageParam;
-import com.yeejoin.amos.supervision.business.param.PlanTaskPageParam;
 import com.yeejoin.amos.supervision.core.common.response.AppPointCheckRespone;
-import com.yeejoin.amos.supervision.dao.entity.Plan;
 import com.yeejoin.amos.supervision.dao.entity.PlanTask;
 
 public interface IPlanTaskService {
@@ -173,5 +171,5 @@ public interface IPlanTaskService {
 
     List<Map<String, Object>> queryTimeAxis(Long userId, Integer createDate);
 
-	void taskExecutionImportPlan(List<Plan> planList);
+    Boolean taskExecutionImportPlan(Long id);
 }