项目管材页面，查看，删除

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/ProjectMaterialDto.java

+package com.yeejoin.amos.boot.module.ugp.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 材料信息表
+ *
+ * @author system_generator
+ * @date 2022-09-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="MaterialDto", description="材料信息表")
+public class ProjectMaterialDto extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "项目id")
+    private Long companyId;
+
+    @ApiModelProperty(value = "管材编号")
+    private String code;
+
+    @ApiModelProperty(value = "管材类别")
+    private String type;
+
+    @ApiModelProperty(value = "管材规格")
+    private String spec;
+
+    @ApiModelProperty(value = "管材壁厚")
+    private Integer wallThickness;
+
+    @ApiModelProperty(value = "生产厂家")
+    private String manufacturer;
+
+    @ApiModelProperty(value = "生产日期")
+    private Date manufactureDate;
+
+    @ApiModelProperty(value = "生产编号")
+    private String batchNum;
+
+    @ApiModelProperty(value = "管道直径")
+    private Double diameter;
+
+    @ApiModelProperty(value = "管道材料")
+    private String material;
+
+    @ApiModelProperty(value = "管道长度")
+    private Double length;
+
+    @ApiModelProperty(value = "厂家所在地")
+    private String manufactureAddr;
+
+    @ApiModelProperty(value = "是否审批通过（1通过，0未通过）")
+    private Boolean approved;
+
+    @ApiModelProperty(value = "单位机构代码")
+    private String orgCode;
+
+    @ApiModelProperty(value = "项目名称")
+    private String  projectName;
+
+    @ApiModelProperty(value = "项目资源id")
+    private Long  projectResourceId;
+}

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

@@ -29,7 +29,7 @@ public interface ProjectResourceMapper extends BaseMapper<ProjectResource> {
     WelderEquipmentDto customSelectById(@Param("sequenceNbr") Long sequenceNbr);
 
     //管材页面分页,根据名称、编号筛选
-    Page<MaterialDto>  MaterialPage(IPage<MaterialDto> page ,@Param("name") String name, @Param("code") String code);
+    Page<ProjectMaterialDto>  MaterialPage(IPage<ProjectMaterialDto> page ,@Param("name") String name, @Param("code") String code);
 
     //根据resource_id删除项目焊工人员信息
     Boolean deleteByResourceId(Long resourceId);

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

@@ -97,12 +97,12 @@
     </select>
 
 <!--    //管材页面分页,根据名称、编号筛选-->
-<!--    Page<MaterialDto>  MaterialPage(IPage<MaterialDto> page ,@Param("name") String name, @Param("code") String code);-->
-    <select id="MaterialPage" resultType="com.yeejoin.amos.boot.module.ugp.api.dto.MaterialDto">
-        SELECT tz_ugp_material.* FROM tz_ugp_material,tz_ugp_project_resource ,tz_ugp_project
-        WHERE tz_ugp_project_resource.project_id=tz_ugp_project.sequence_nbr
-          AND  tz_ugp_project_resource.resource_id=tz_ugp_material.sequence_nbr
-          AND tz_ugp_project_resource.type="material"
+    <select id="MaterialPage" resultType="com.yeejoin.amos.boot.module.ugp.api.dto.ProjectMaterialDto">
+        SELECT tz_ugp_material.*,tz_ugp_project.name AS projectName ,tz_ugp_project_resource.sequence_nbr as projectResourceId
+        FROM  tz_ugp_project_resource
+                  LEFT JOIN tz_ugp_material ON tz_ugp_project_resource.resource_id=tz_ugp_material.sequence_nbr
+                  LEFT JOIN tz_ugp_project ON tz_ugp_project_resource.project_id=tz_ugp_project.sequence_nbr
+        WHERE tz_ugp_project_resource.type="material"
           AND tz_ugp_material.name LIKE  '%${name}%' AND tz_ugp_material.code LIKE '%${code}%'
     </select>
 

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

@@ -2,11 +2,13 @@ package com.yeejoin.amos.boot.module.ugp.biz.controller;
 
 import com.netflix.ribbon.proxy.annotation.Http;
 import com.yeejoin.amos.boot.module.ugp.api.dto.MaterialDto;
+import com.yeejoin.amos.boot.module.ugp.api.dto.ProjectMaterialDto;
 import com.yeejoin.amos.boot.module.ugp.api.dto.WelderEquipmentDto;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.module.ugp.api.entity.ProjectResource;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.ProjectMapper;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.ProjectResourceMapper;
+import com.yeejoin.amos.boot.module.ugp.biz.service.impl.MaterialServiceImpl;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -44,6 +46,8 @@ public class ProjectResourceController extends BaseController {
 
     @Autowired
     ProjectResourceMapper projectResourceMapper;
+    @Autowired
+    MaterialServiceImpl materialServiceImpl;
 
     /**
      * 新增项目资源表（包括焊工、管材、设备）
@@ -198,15 +202,30 @@ public class ProjectResourceController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @GetMapping(value = "/materialPage")
     @ApiOperation(httpMethod = "GET", value = "焊机设备分页查询", notes = "焊机设备分页查询")
-    public ResponseModel<Page<MaterialDto>> queryForMaterialPage(
+    public ResponseModel<Page<ProjectMaterialDto>> queryForMaterialPage(
             @RequestParam(value = "current") int current,
             @RequestParam(value = "size") int size,
             @RequestParam(value = "name", required = false) String name,
             @RequestParam(value = "code", required = false) String code
     ) {
-        Page<MaterialDto> page = new Page<MaterialDto>();
+        Page<ProjectMaterialDto> page = new Page<ProjectMaterialDto>();
         page.setCurrent(current);
         page.setSize(size);
         return ResponseHelper.buildResponse(projectResourceMapper.MaterialPage(page,name,code));
     }
+
+    /**
+     * 根据sequenceNbr查询项目材料
+     *
+     * @param sequenceNbr  主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @GetMapping(value = "IM/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询材料和附件",  notes = "根据sequenceNbr查询材料和附件")
+    public ResponseModel<JSONObject> selectIMOne(@PathVariable Long sequenceNbr) {
+        JSONObject jsonObject = materialServiceImpl.groupBySeq(sequenceNbr);
+        jsonObject.getLong("sequenceNbr");
+        return ResponseHelper.buildResponse(materialServiceImpl.groupBySeq(sequenceNbr));
+    }
 }