1.维保app联调bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/dto/CheckInputDto.java

@@ -18,8 +18,27 @@ public class CheckInputDto {
 	private String inputValue;
 	private String isOk;
 	private String isOkDesc;
+	/**
+	 * 拍照配置
+	 */
 	private String pictureJson;
+	/**
+	 * 选择项和文本项配置
+	 */
 	private String dataJson;
+	/**
+	 * 检查依据
+	 */
+	private String basisJson;
+	/**
+	 * 是否必输
+	 */
+	private String isMust;
+
+	/**
+	 * 测试要求
+	 */
+	private String testRequirement;
 	private String remark;
 	private List<CheckShotDto> checkInputShot;
 }

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

@@ -235,8 +235,6 @@ public class PointServiceImpl implements IPointService {
     public List<Long> delPointById(Long[] ids) {
         List<Long> idList = new ArrayList<Long>();
         idList.addAll(Arrays.asList(ids));
-        List<PointInputItem> pointInputItem = iPointInputItemDao.findAllById(idList);
-        List<Long> pointInputItemIds = Lists.transform(pointInputItem, PointInputItem::getId);
         // 物理删除p_point_inputitem表对应行
         iPointInputItemDao.deleteByPointId(idList);
         // 物理删除p_route_point、p_route_point_item中相关行
@@ -245,6 +243,7 @@ public class PointServiceImpl implements IPointService {
             iRoutePointItemDao.delRoutePointItem(routePointId.longValue());
             iRoutePointDao.deleteById(Long.parseLong(routePointId.toString()));
         }
+        //更新任务完成点数量、点总数量
         for (long pointId : idList) {
             List<PlanTaskDetail> planDetailList = iPlanTaskDetailDao.findALLByPointId(pointId);
             for (PlanTaskDetail planTaskDetail : planDetailList) {
@@ -262,9 +261,9 @@ public class PointServiceImpl implements IPointService {
                 }
             }
         }
-        // 删除p_plan_task_detail相关行
+        // 物联删除p_plan_task_detail相关行
         iPlanTaskDetailDao.deletePlanTaskDetailByPointId(idList);
-        // 删除p_point相关行
+        // 假删除p_point相关行
         iPointDao.delPointById(idList);
         return idList;
     }

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

@@ -1965,6 +1965,9 @@
                 )
                 )
             </if>
+            <if test="result !=null and result !=''">
+                and a.isOk = #{result}
+            </if>
             <choose>
                 <when test="identityType==1">
                     And (a.orgCode LIKE CONCAT( #{orgCode}, '-%' ) or a.orgCode= #{orgCode} )
@@ -2062,7 +2065,10 @@
            ci.order_no,
            #{fileUrl} as prefix,
            ii.picture_json,
-           ii.data_json
+           ii.data_json,
+           ii.test_requirement as testRequirement,
+           ii.basis_json as basisJson,
+           ii.is_must as isMust
         from p_check_input ci
          left join p_input_item ii on ci.input_id = ii.id
         where ci.check_id=#{checkId}

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

@@ -239,6 +239,8 @@
 			pii.item_type itemType,
 			pii.test_requirement testRequirement,
 			pii.data_json dataJson,
+			pii.basis_json as basisJson,
+			pii.default_value as defaultValue,
 			pii.is_must isMust,
 			pii.picture_json pictureJson,
 			pii.order_no orderNo,