管材和设备库

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/mapper/EquipmentMapper.java

@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.module.ugp.api.entity.Equipment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.openxmlformats.schemas.drawingml.x2006.main.STAdjAngle;
 
 import java.util.List;
 import java.util.Map;
@@ -28,4 +29,7 @@ public interface EquipmentMapper extends BaseMapper<Equipment> {
 
     List<Map<String, Object>> boundWelderList(@Param("projectId") String projectId, @Param("companyId") Long companyId, @Param("name") String name);
 
+
+    Page<Map<String,Object>> getEqChangeList(IPage<Map<String, Object>> page,@Param("projectId") String projectId);
+
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/mapper/MaterialMapper.java

 package com.yeejoin.amos.boot.module.ugp.api.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.ugp.api.dto.MaterialCount;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Material;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -27,4 +29,7 @@ public interface MaterialMapper extends BaseMapper<Material> {
     List<MaterialCount> getMaterialCount();//
     List<MaterialCount> getConditionCount( @Param("listIdList") List<Long> listIdList);
 
+    Page<Map<String,Object>> getMterChangeList(IPage<Map<String, Object>> page, @Param("projectId") String projectId);
+
+
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/EquipmentMapper.xml

@@ -74,5 +74,20 @@
         </where>
     </select>
 
+    <select id="getEqChangeList" resultType="java.util.Map">
+
+        SELECT
+            te.*,
+            tm.info
+        FROM
+            tz_ugp_equipment te
+                LEFT JOIN tz_ugp_attachment tm ON te.sequence_nbr = tm.source_id
+                AND tm."type" = 'enuipment'
+        WHERE
+                te.company_id = ( SELECT tt.installation_unit_id FROM tz_ugp_project tt WHERE tt.sequence_nbr = #{projectId} )
+          AND te.sequence_nbr NOT IN ( SELECT re.resource_id FROM tz_ugp_project_resource re)
+
+    </select>
+
 
 </mapper>

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/MaterialMapper.xml

@@ -35,4 +35,23 @@
      GROUP BY
     manufacture_addr
 </select>
+
+    <select id="getMterChangeList" resultType="java.util.Map">
+
+        SELECT
+            te.*,
+            tm.info
+        FROM
+            tz_ugp_material te
+                LEFT JOIN tz_ugp_attachment tm ON te.sequence_nbr = tm.source_id
+                AND tm."type" = 'material'
+        WHERE
+                te.company_id = ( SELECT tt.installation_unit_id FROM tz_ugp_project tt WHERE tt.sequence_nbr = #{projectId} )
+          AND te.sequence_nbr NOT IN ( SELECT re.resource_id FROM tz_ugp_project_resource re WHERE re.type='material')
+
+
+
+
+
+    </select>
 </mapper>

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/EquipmentController.java

@@ -311,4 +311,21 @@ public class EquipmentController extends BaseController {
 												@RequestParam(value = "name", required = false) String name) {
 		return ResponseHelper.buildResponse(equipmentServiceImpl.boundWelder(projectId, current, size, name, "all"));
 	}
+
+
+	/**
+	 * 查询设备库
+	 * */
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@GetMapping(value = "/getEqChangeList")
+	@ApiOperation(httpMethod = "GET", value = "查询设备库", notes = "查询设备库")
+	public ResponseModel<Object> getEqChangeList(@RequestParam(value = "projectId") String projectId,
+												@RequestParam(value = "current") int current,
+												@RequestParam(value = "size") int size
+												) {
+		return ResponseHelper.buildResponse(equipmentServiceImpl.getEqChangeList(projectId,current,size));
+	}
+
+
+
 }

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/MaterialController.java

@@ -312,4 +312,17 @@ public class MaterialController extends BaseController {
 		jsonObject.put("subForm", designSubForm);
 		return ResponseHelper.buildResponse(jsonObject);
 	}
+
+	/**
+	 * 查询管材库
+	 * */
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@GetMapping(value = "/getMterChangeList")
+	@ApiOperation(httpMethod = "GET", value = "查询管材库", notes = "查询管材库")
+	public ResponseModel<Object> getMterChangeList(@RequestParam(value = "projectId") String projectId,
+												 @RequestParam(value = "current") int current,
+												 @RequestParam(value = "size") int size
+	) {
+		return ResponseHelper.buildResponse(materialServiceImpl.getMterChangeList(projectId,current,size));
+	}
 }

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/EquipmentServiceImpl.java

@@ -316,4 +316,10 @@ public class EquipmentServiceImpl extends BaseService<EquipmentDto, Equipment, E
             return listPage;
         }
     }
+
+    public Page<Map<String, Object>> getEqChangeList(String projectId, Integer current, Integer size) {
+        Page<Map<String, Object>> eqChangeList = equipmentMapper.getEqChangeList(new Page<Map<String, Object>>(current, size), projectId);
+        return eqChangeList;
+    }
+
 }
\ No newline at end of file

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/MaterialServiceImpl.java

@@ -412,4 +412,8 @@ public class MaterialServiceImpl extends BaseService<MaterialDto, Material, Mate
     }
 
 
+    public Page<Map<String, Object>> getMterChangeList(String projectId, int current, int size) {
+        Page<Map<String, Object>> mterChangeList = materialMapper.getMterChangeList(new Page<Map<String, Object>>(current, size), projectId);
+        return mterChangeList;
+    }
 }
\ No newline at end of file