1,p_check 增加冗余字段业主单位名称

amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/dao/entity/Check.java

@@ -224,6 +224,11 @@ public class Check extends BasicEntity {
     private String ownerId;
 
     /**
+     * 业主单位名称
+     */
+    private String ownerName;
+
+    /**
      * 维保公司id
      */
     private String companyId;
@@ -288,6 +293,13 @@ public class Check extends BasicEntity {
         this.companyName = companyName;
     }
 
+    public String getOwnerName() {
+        return ownerName;
+    }
+
+    public void setOwnerName(String ownerName) {
+        this.ownerName = ownerName;
+    }
 
     public String getOwnerId() {
         return ownerId;

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/entity/mybatis/PlanTaskPointInputItemBo.java

@@ -47,6 +47,11 @@ public class PlanTaskPointInputItemBo {
 	private String ownerId;
 
 	/**
+	 * 业主单位名称
+	 */
+	private String ownerName;
+
+	/**
 	 * 单位id
 	 */
 	private String companyId;

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/CheckServiceImpl.java

@@ -112,6 +112,9 @@ public class CheckServiceImpl implements ICheckService {
     @Value("${file.url}")
     private String fileUrl;
 
+    @Autowired
+    IRouteDao iRouteDao;
+
     final String CHECK_UPDATE_TOPIC = "maintenance/date/update";
 
 
@@ -138,6 +141,7 @@ public class CheckServiceImpl implements ICheckService {
         //1.前置校验
         this.checkCanFinishTask(mtUserSeq, planTask, recordParam.getPointId());
         Point point = iPointService.queryPointById(recordParam.getPointId());
+        Route route = iRouteDao.findById(planTask.getRouteId()).orElseThrow(() -> new RuntimeException("路线不存在"));
         Check check = new Check();
         if (ObjectUtils.isEmpty(point) || ObjectUtils.isEmpty(detail)) {
             throw new Exception("前置校验不通过");
@@ -161,7 +165,8 @@ public class CheckServiceImpl implements ICheckService {
             check.setUploadTime(new Date());
             check.setOrgCode(recordParam.getOrgCode());
             check.setUserId(mtUserSeq);
-            check.setOwnerId(point.getOwnerId());
+            check.setOwnerId(route.getOwnerId());
+            check.setOwnerName(route.getOwnerName());
             check.setBuildingName(point.getBuildingName());
             check.setEquipmentName(point.getEquipmentName());
             check.setPlanType(detail.get("planType").toString());
@@ -1122,7 +1127,7 @@ public class CheckServiceImpl implements ICheckService {
         if (facility.containsKey("isOk")) {
             facility.put("isOkDesc", CheckStatusEnum.getEnum(String.valueOf(facility.get("isOk"))).getName());
         }
-        if(facility.containsKey("planType")){
+        if (facility.containsKey("planType")) {
             PlanTypeEnum planType = PlanTypeEnum.getEnumByCode(String.valueOf(facility.get("planType")));
             facility.put("planTypeDesc", planType != null ? planType.getName() : "其他");
         }

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/quartz/JobService.java

@@ -212,6 +212,7 @@ public class JobService implements IJobService {
                 check.setRouteName(arg.getRouteName());
                 check.setCheckTime(arg.getEndTime());
                 check.setOwnerId(arg.getOwnerId());
+                check.setOwnerName(arg.getOwnerName());
                 check.setCompanyId(arg.getCompanyId());
                 check.setCompanyName(arg.getCompanyName());
                 check.setEquipmentName(arg.getEquipmentName());
@@ -323,8 +324,7 @@ public class JobService implements IJobService {
                 updatePlanTaskStatus(planTask, PlanTaskFinishStatusEnum.OVERTIME.getValue());
             }
         } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            e.printStackTrace();
+            log.error("任务加到定时任务或者更新失败", e);
         }
     }
 

amos-boot-system-maintenance/src/main/resources/db/changelog/mt-1.0.0.xml

@@ -223,4 +223,15 @@
             ALTER TABLE p_check add COLUMN `end_time` datetime DEFAULT NULL COMMENT '结束时间' after `begin_time`;
         </sql>
     </changeSet>
+    <changeSet author="suhuiguang" id="1630291249911-4">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_check" columnName="owner_name"/>
+            </not>
+        </preConditions>
+        <comment>p_check add COLUMN owner_name '业主单位名称'</comment>
+        <sql>
+            ALTER TABLE p_check add COLUMN `owner_name` varchar(255) DEFAULT NULL COMMENT '业主单位名称' after `owner_id`;
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

amos-boot-system-maintenance/src/main/resources/db/mapper/dbTemplate_plan_task.xml

@@ -393,6 +393,7 @@
 			temp1.buildingName,
 			temp1.equipmentName,
 			temp1.remark as riskAndManage,
+			temp1.ownerName,
 			pii.`name` inputName,
 			temp2.*
 		FROM
@@ -411,6 +412,7 @@
 				    r.name as routeName,
 					p.name as pointName,
 				    p.owner_id as ownerId,
+				    p.owner_name as ownerName,
 				    p.point_no as pointNo,
 				    p.building_name as buildingName,
 					p.equipment_name as equipmentName,
@@ -432,7 +434,7 @@
 					ptd.plan_id planId,
 					ptd.user_id AS userId,
 					ptd.org_code AS orgCode,
-					ptd.end_time AS endTime,
+					ptd.begin_time AS beginTime,
 					ptd.end_time AS endTime,
 					ptd.company_id as companyId,
 					ptd.company_name as companyName,