修改代码

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/EquipmentManageVo.java

@@ -121,4 +121,7 @@ public class EquipmentManageVo  implements Serializable {
     private String bizOrgCode;
 
     private String bizOrgName;
+
+    private String controBoxBuildName;
+    private String controBoxBuildId;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentCategoryController.java

@@ -339,7 +339,7 @@ public class EquipmentCategoryController extends AbstractBaseController {
 		List<EquipmentCategory> list = new ArrayList<>();
 		Map<String, List<EquipmentCategory>> tmpMap = new HashMap<String, List<EquipmentCategory>>();
 		equipmentCategorys.forEach(action -> {
-			if (action.getName().equals("消防设施")) {
+			if (action.getName().equals("消防设施") ||action.getName().equals("消防系统")) {
 				list.add(action);
 			} else {
 				if (tmpMap.get(action.getParentId().toString()) == null) {

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

@@ -295,7 +295,7 @@ public class PointController extends AbstractBaseController {
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(value = "删除巡查对象", notes = "删除巡查对象")
-	@GetMapping(value = "/queryPointByIdNew", produces = "application/json;charset=UTF-8")
+	@GetMapping(value = "/deletPointClassify", produces = "application/json;charset=UTF-8")
 	public CommonResponse deletPointClassify(@ApiParam(value = "巡查对象id", required = true) @RequestParam Long id) {
 		try {
 			//如果点下只有一个对象，并且点已经关联线路就不能删除
@@ -375,22 +375,6 @@ public class PointController extends AbstractBaseController {
 	 *
 	 * 新增接口
 	 * **/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 	/**
 	 * 增加巡检点
 	 *
@@ -705,14 +689,14 @@ public class PointController extends AbstractBaseController {
 	}
 
 /**新加接口**/
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@ApiOperation(value = "导入导入模板新", notes = "导入模板新")
-	@PostMapping(value = "/exportTemplateNew", produces = "application/json;charset=UTF-8")
+	@GetMapping(value = "/exportTemplateNew", produces = "application/json;charset=UTF-8")
 	public CommonResponse exportTemplateNew(HttpServletResponse response) {
 		String userId = getUserId();
 		ReginParams reginParams = getSelectedOrgInfo();
 		String loginOrgCode = getOrgCode(reginParams);
-		String fileName = "巡检点导入模板"; //模板名称
+		String fileName = "巡检点导入模板.xls"; //模板名称
 		String[] handers = {"点编号","点名称","是否为移动点","计划外巡检是否评分","是否允许离线巡检","参考地址","最少拍照数量","最多拍照数量","风险等级","备注说明","检查项目","是否室内"}; //列标题
 		List<String[]> downData = new ArrayList();
 		String[] isScore = {"否","是"};

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

@@ -17,6 +17,7 @@ public class PointVo {
 	private String routeName;
 
 	private String bizOrgCode;
+	@Excel(name ="所属单位/部门",orderNum = "7")
 	private String bizOrgName;
 
 	public String getBizOrgCode() {

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

@@ -321,7 +321,7 @@
         FROM wl_equipment_category ec
                  left join wl_industry i on ec.industry_code = i.code
         WHERE
-            ec.code NOT LIKE CONCAT ('930','%')
+            ec.code NOT LIKE CONCAT ('930','%') and ec.code NOT LIKE CONCAT ('92','%')
     </select>
 
     <select id="getEquipmentCategoryListByFacilities" resultMap="Category">
@@ -335,13 +335,29 @@
                ec.remark,
                ec.create_date,
                i.`name` as industryName,
-               -- industry_code = 2代表消防设备
-               IF(LEFT(ec.CODE, 1) = #{head} and ec.industry_code = 2, 'car', 'equipment')
+               IF(LEFT(ec.CODE, 1) = 2 and ec.industry_code = 2, 'car', 'equipment')
                         AS type
         FROM wl_equipment_category ec
                  left join wl_industry i on ec.industry_code = i.code
         WHERE
             ec.code LIKE CONCAT ('930','%')
+        UNION ALL
+        SELECT ec.id,
+               ec.parent_id,
+               ec.id as CODE,
+               ec.NAME,
+               ec.is_consumptive,
+               ec.description,
+               ec.industry_code,
+               ec.remark,
+               ec.create_date,
+               i.`name` as industryName,
+               IF(LEFT(ec.CODE, 1) = 2 and ec.industry_code = 2, 'car', 'equipment')
+                   AS type
+        FROM wl_equipment_category ec
+                 left join wl_industry i on ec.industry_code = i.code
+        WHERE
+            (ec.code LIKE CONCAT ('92','%') and ec.parent_id = '1302863809086623746') or (ec.code LIKE CONCAT ('92','%') and ec.parent_id = '846')
     </select>
 
 

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

@@ -10,6 +10,8 @@
             instance_id,
             date_format(install_date,'%Y-%m-%d') AS installDate,
             date_format(first_maintenance_date,'%Y-%m-%d') AS firstMaintenanceDate,
+            contro_box_build as controBoxBuildId,
+            (select full_name from wl_warehouse_structure where id = contro_box_build) as controBoxBuildName,
         charge_person_name as chargePerson,
             (select name from wl_manufacturer_info where id = construction_unit) as constructionUnit,
             (select name from wl_manufacturer_info where id = maintenance_unit) as maintenanceUnit,

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

@@ -149,6 +149,18 @@
 			<if test="nameOrItemNo!=null and nameOrItemNo !='' ">
 				and (name like concat("%", #{nameOrItemNo}, "%") or item_no like concat("%", #{nameOrItemNo}, "%"))
 			</if>
+			<if test="equipmentType!=null and equipmentType !=''">
+				and  equipment_type = #{equipmentType}
+			</if>
+			<if test="keyPartsType!=null and keyPartsType !=''">
+			and  key_parts_type = #{keyPartsType}
+			</if>
+			<if test="facilitiesType!=null and facilitiesType !=''">
+			and  facilities_type = #{facilitiesType}
+			</if>
+			<if test="customType!=null and customType !=''">
+			and  custom_type = #{customType}
+			</if>
 		ORDER BY create_date DESC
 	</select>
 	<select id="queryCustomInputItemByPointId" resultType="com.yeejoin.amos.patrol.business.vo.PointInputItemVo">