bug xiugai

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgPersonController.java

@@ -457,6 +457,9 @@ public class OrgPersonController extends BaseController {
     @RequestMapping(value = "/listCompany/{bizOrgCode}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "查询当前单位或部门自己的人员列表 非父子级", notes = "根据bizOrgCode查询")
     public List<OrgUsr>  listCompany(@PathVariable String bizOrgCode) {
+        if (StringUtils.isEmpty(bizOrgCode)) {
+            return null;
+        }
         LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(BaseEntity::getIsDelete,false);
         wrapper.likeRight(OrgUsr::getBizOrgCode,bizOrgCode);

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PointController.java

@@ -1557,7 +1557,7 @@ public class PointController extends AbstractBaseController {
 	@ApiOperation(value = "查询巡检点信息", notes = "查询巡检点信息")
 	@PostMapping(value = "/listNew", produces = "application/json;charset=UTF-8")
 	public CommonResponse listPointNew(
-			@ApiParam(value = "查询条件", required = false) @RequestBody(required = false)  Point point,
+			@ApiParam(value = "查询条件", required = false) @RequestBody(required = false)  PointQueryVo point,
 			@RequestParam(value = "pageNumber", defaultValue = "1") int current,
 			@RequestParam(value = "pageSize", defaultValue = "10") int size) {
 		ReginParams reginParams = getSelectedOrgInfo();

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/PointMapper.java

@@ -6,7 +6,7 @@ import java.util.Map;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.patrol.business.vo.PointInputItemNewVo;
+import com.yeejoin.amos.patrol.business.vo.*;
 import com.yeejoin.amos.patrol.core.common.request.CommonPageable;
 import com.yeejoin.amos.patrol.dao.entity.Point;
 import org.apache.ibatis.annotations.Param;
@@ -14,9 +14,6 @@ import org.apache.ibatis.annotations.Param;
 import com.yeejoin.amos.patrol.business.entity.mybatis.CheckPtListBo;
 import com.yeejoin.amos.patrol.business.param.CheckPtListPageParam;
 import com.yeejoin.amos.patrol.business.param.PointImportQueryParam;
-import com.yeejoin.amos.patrol.business.vo.LeavelMovePointVo;
-import com.yeejoin.amos.patrol.business.vo.PointInputItemVo;
-import com.yeejoin.amos.patrol.business.vo.PointVo;
 import com.yeejoin.amos.patrol.core.common.response.PointResponse;
 import com.yeejoin.amos.patrol.dao.entity.PointConfig;
 import com.yeejoin.amos.patrol.dao.entity.PointPhoto;
@@ -53,9 +50,9 @@ public interface PointMapper extends BaseMapper {
 	List<PointInputItemVo> getPointClassInputItemById(@Param(value = "pointId") Long pointId);
 
 
-	List<Point> listByParams(Point pointParams, Page page);
+	List<Point> listByParams(PointQueryVo pointParams, Page page);
 
-	int listByParamsCount(Point pointParams);
+	int listByParamsCount(PointQueryVo pointParams);
 
 	/**
 	 * 根据点ID获取点图片信息

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

@@ -1964,7 +1964,7 @@ public class PointServiceImpl implements IPointService {
     }
 
 /*13迭代新增列表方法*/
-    public IPage<PointVo> queryPointInfoNew(Point pointParams, int current ,int size, String loginOrgCode) {
+    public IPage<PointVo> queryPointInfoNew(PointQueryVo pointParams, int current ,int size, String loginOrgCode) {
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<Object> page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(current, size);
         List<Point> pointPage = pointMapper.listByParams(pointParams,page);
         int num = pointMapper.listByParamsCount(pointParams);

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/IPointService.java

@@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.patrol.business.entity.mybatis.CheckPtListBo;
 import com.yeejoin.amos.patrol.business.param.*;
 import com.yeejoin.amos.patrol.business.util.DaoCriteria;
-import com.yeejoin.amos.patrol.business.vo.LeavelMovePointVo;
-import com.yeejoin.amos.patrol.business.vo.PointClassifyVo;
-import com.yeejoin.amos.patrol.business.vo.PointInputItemVo;
-import com.yeejoin.amos.patrol.business.vo.PointVo;
+import com.yeejoin.amos.patrol.business.vo.*;
 import com.yeejoin.amos.patrol.core.common.request.CommonPageable;
 import com.yeejoin.amos.patrol.core.common.response.PointResponse;
 import com.yeejoin.amos.patrol.dao.entity.Point;
@@ -36,7 +33,7 @@ public interface IPointService {
  *
  */
 
-    IPage<PointVo> queryPointInfoNew(Point pointParams,int current,int size, String loginOrgCode);
+    IPage<PointVo> queryPointInfoNew(PointQueryVo pointParams, int current, int size, String loginOrgCode);
 
     /**
      * 添加巡检点

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/vo/PointQueryVo.java

+package com.yeejoin.amos.patrol.business.vo;
+
+
+import com.yeejoin.amos.patrol.dao.entity.BasicEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+
+@Data
+public class PointQueryVo extends BasicEntity {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 参考地址
+     */
+    private String address;
+
+    /**
+     * 分类编号
+     */
+    private long catalogId;
+
+    /**
+     * 3维坐标(x,y,z)
+     */
+    private String coordinates;
+
+    /**
+     * 创建用户id
+     */
+    private String creatorId;
+
+    /**
+     * 有效巡检距离
+     */
+    private int distance;
+
+    /**
+     * 扩展字段
+     */
+    private String extendJson;
+
+    /**
+     * 定点拍照数
+     */
+    private int fixedShot;
+
+    /**
+     * 是否为固定点(1:固定点，0：移动点)
+     */
+    private String isFixed;
+
+    /**
+     * 无计划巡检是否评分(is_score = 1评分,0不评分)
+     */
+    private String isScore;
+
+    /**
+     * 最新更新时间
+     */
+    private Date lastUpdateTime;
+
+    /**
+     * 经度
+     */
+    private String latitude;
+
+    /**
+     * 风险等级(1:一级，2：二级，3：三级，4：四级，5：五级)
+     */
+    private String level;
+
+    /**
+     * 纬度
+     */
+    private String longitude;
+
+    /**
+     * 点名称
+     */
+    private String name;
+
+    /**
+     * 是否允许离线巡检
+     */
+    private Boolean offline;
+
+    /**
+     * 权限系统org code
+     */
+    private String orgCode;
+
+    /**
+     * 点编号
+     */
+    private String pointNo;
+
+    /**
+     * 备注说明
+     */
+    private String remark;
+
+    /**
+     * 路线id
+     */
+    private String routeId;
+
+    /**
+     * 路线名称
+     */
+    private String routeName;
+
+    /**
+     * 是否保存地理信(1:记录，0：不记录)
+     */
+    private String saveGps;
+
+    /**
+     * 最大拍照数
+     */
+    private int shotMaxNumber;
+
+    /**
+     * 最小拍照数
+     */
+    private int shotMinNumber;
+
+    /**
+     * 是否允许普通拍照(1：允许，0：不允许)
+     */
+    private String usuallyShot;
+
+    /**
+     * 是否删除：0表示未删除，1表示已删除
+     */
+    private boolean isDelete;
+
+    /**
+     * 归属区域/部门id
+     */
+    private String chargeDeptId ;
+
+    /**
+     * 负责人id
+     */
+    private String chargePersonId ;
+
+    /**
+     * 负责人id
+     */
+    private String chargePersonName ;
+
+
+    /**
+     * 状态：0 未纳入巡检，1 合格；2 不合格；3 漏检
+     */
+    private String status;
+
+    /**
+     * 3维模型楼层
+     */
+    private Integer floor;
+
+    /**
+     * 是否室内
+     */
+    private Boolean isIndoor;
+
+    /**
+     * 原始字段
+     */
+    private String originalId;
+
+    /**
+     * 风险源id
+     */
+    private String riskSourceId;
+
+    /**
+     * ue4位置
+     */
+
+    private String ue4Location;
+
+    /**
+     * ue4旋转
+     */
+
+    private String ue4Rotation;
+
+    private String bizOrgCode;
+
+    private String bizOrgName;
+
+    /**
+     * 物理区域id（数据来源于装备wl_area）
+     */
+    private Long areaId;
+    /**
+     * 物理区域名称（数据来源于装备wl_area）
+     */
+    private String areaName;
+}
\ No newline at end of file

amos-boot-system-equip/src/main/resources/mapper/EquipmentManageMapper.xml

@@ -26,6 +26,7 @@
 	        sys.design_org,
 	        sys.lead_designer,
 	        sys.design_org_telephone,
+            wec.code as categoryCode,
 	        (select count(1) from `wl_equipment_specific` es where find_in_set(sys.id,es.system_id) and es.single = true ) equipCount,
 	        wws.full_name as fullName
 	        from

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

@@ -25,8 +25,8 @@
 			<if test="inputClassify != null ">input_classify=#{inputClassify},</if>
 			<if test="unit != null ">unit=#{unit},</if>
 			<if test="facilitiesType != null ">facilities_type=#{facilitiesType},</if>
-			<if test="keyPartsType != null ">key_parts_type=#{keyPartsType},</if>
-			<if test="customType != null ">custom_type=#{customType},</if>
+			<if test="1 == 1">key_parts_type=#{keyPartsType},</if>
+			<if test="1 == 1">custom_type=#{customType},</if>
 			<if test="equipmentType != null ">equipment_type=#{equipmentType},</if>
  		</trim>
  		WHERE id=#{id}