Merge remote-tracking branch 'origin/develop_tzs_main' into develop_tzs_main

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -982,7 +982,7 @@
             tjin."CONSTRUCTION_IS_XI_XIAN"           as  installIsXixian,
             tjin."CONSTRUCTION_LEADER_PHONE"         as  installLeaderPhone ,
             tjin."USC_DATE"                          as  installStartDate ,
-            ibjui."USC_UNIT_NAME"                    as  installPropertyUnitName ,
+            tjin."USC_UNIT_NAME"                     as  installPropertyUnitName ,
             tjin."PROXY_STATEMENT_ATTACHMENT"        as  installProxyStatementAttachment ,
             tjin."CONSTRUCTION_CONTRACT_ATTACHMENT"  as  installContractAttachment ,
             tjin."CONSTRUCTION_OTHER_ACCESSORIES"    as  insOtherAccessories

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CommonServiceImpl.java

@@ -3501,7 +3501,10 @@ public class CommonServiceImpl implements ICommonService {
     }
 
     public String queryBaseUnitNameByCreditCode(String unitCreditCode) {
-        return ValidationUtil.isEmpty(unitCreditCode) ? unitCreditCode : commonMapper.queryUnitNameByCreditCode(unitCreditCode);
+        if (!ValidationUtil.isEmpty(unitCreditCode)) {
+            return ValidationUtil.isEmpty(commonMapper.queryUnitNameByCreditCode(unitCreditCode)) ? unitCreditCode : commonMapper.queryUnitNameByCreditCode(unitCreditCode);
+        }
+        return null;
     }
 
     public void batchInsertResumeEq(Long resumeId, List<Map<String, Object>> equipmentLists) {

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java

@@ -726,6 +726,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void taskExecution(String runDate) {
+        log.info("生成计划任务执行开始");
         //1.扫描plan表查询，需要生成执行数据的任务信息，无则return
         Date now = new Date();//今天
         if (runDate != null) {//上送则已上送的为准
@@ -739,9 +740,11 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
             log.info(strDate + " " + " 暂无待生成执行数据的计划");
             return;
         }
+        log.info(strDate + "：" + "待生成计划任务的计划数量：" + planList.size());
         //2.循环遍历执行
         HashMap<String, Object> paramMap = new HashMap<String, Object>();
         for (Plan plan : planList) {
+            log.info(plan.getName() + "：" + plan.getId() + "：" + "开始生成计划任务：");
             // 校验计划数据是否异常
             if (!checkData(plan.getId())) {
                 continue;
@@ -796,10 +799,11 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
             //2.5.插入planTask及planTaskDetail
             insertPlanTaskAndDetNew(list, plan, XJConstant.SCHED_FLAG, now);
 
+            log.info(plan.getName() + "：" + plan.getId() + "：" + "计划任务生成完毕");
+        }
         // 更新统计表
         taskStaticExecution(null);
-
-        }
+        log.info("生成计划任务执行结束");
     }
 
     /**
@@ -939,6 +943,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
      * @param flag 是否初始状态0-初始 1-非初始
      */
     public void insertPlanTaskAndDetNew(List<HashMap<String, Object>> list, Plan plan, String flag, Date now) {
+        log.info("开始insertPlanTaskAndDetNew");
         if (list == null || list.size() <= 0) {
             HashMap<String, Object> paramMap = new HashMap<String, Object>();
             paramMap.put("id", plan.getId());
@@ -1054,8 +1059,9 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
                 // 定时任务监控
                 log.error("计划重做开始添加定时任务监控========");
                 jobService.planTaskAddJob(planTask);
-
+                log.info("计划重做添加定时任务监控结束========");
                 Iterable<PlanTaskDetail> planTaskDetails = repositoryTs.batchSaveNoAsync(planTaskDetailListSync);
+                log.info("计划重做保存执行数据明细表结束========");
 
                 // 3.如果为自动任务调用,则更新id，如果重做或且下次时间大于等于明天，则更新planTaskId到plan表
                 Date genDate = DateUtil.str2Date(list.get(list.size() - 1).get("NEXT_GEN_DATE").toString(), "yyyy-MM-dd");//下次生成日期
@@ -1077,9 +1083,10 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
                 }
                 planMapper.updPlanStatusOrGenDate(paramMap);// 更新下次任务生成日期
 
-
+                log.info("es计划重做保存执行数据明细表开始========");
                 //存在事物,在事务提交之后执行
                 asyncSaveEs(planTaskDetails, esPlanTaskListDtos);
+                log.info("es计划重做保存执行数据明细表结束========");
 
             } catch (Exception e) {
                 e.printStackTrace();
@@ -1087,6 +1094,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
                 throw new RuntimeException(e.getMessage());
             }
         }
+        log.info("结束insertPlanTaskAndDetNew");
     }
 
     private void asyncSaveEs(Iterable<PlanTaskDetail> planTaskDetails, List<ESPlanTaskListDto> esPlanTaskListDtos) {