dd

src/main/java/com/its/op/dao/repository/its/facility/TbFcltInfrRepository.java

@@ -12,13 +12,28 @@ import java.util.List;
 @Repository
 public interface TbFcltInfrRepository extends JpaRepository<TbFcltInfr, Long>, JpaSpecificationExecutor<TbFcltInfr> {
 
-    @Query("select p from TbFcltInfr p")
+    @Query("select p from TbFcltInfr p left outer join p.mnfcCmpy  a " +
+            "                          left outer join p.istlCmpy  b " +
+            "                          left outer join p.maintCmpy c " +
+            "                          left outer join p.mainUser  d " +
+            "                          left outer join p.subUser   e")
     List<TbFcltInfr> findAll();
 
-    @Query("select p from TbFcltInfr p where p.delYn = 'N'")
+    @Query("select p from TbFcltInfr p left outer join p.mnfcCmpy  a " +
+           "                           left outer join p.istlCmpy  b " +
+           "                           left outer join p.maintCmpy c " +
+           "                           left outer join p.mainUser  d " +
+           "                           left outer join p.subUser   e " +
+           " where p.delYn = 'N'")
     List<TbFcltInfr> findAllList();
 
-    @Query("select p from TbFcltInfr p where p.delYn = 'N' and p.fcltType = :fcltType")
+    @Query("select p from TbFcltInfr p left outer join p.mnfcCmpy   a " +
+            "                           left outer join p.istlCmpy  b " +
+            "                           left outer join p.maintCmpy c " +
+            "                           left outer join p.mainUser  d " +
+            "                           left outer join p.subUser   e " +
+            " where p.delYn = 'N' and p.fcltType = :fcltType")
+
     List<TbFcltInfr> findAllByFcltType(@Param("fcltType") String fcltType);
 
 }

src/main/java/com/its/op/dto/its/facility/TbFcltInfrDto.java

@@ -60,6 +60,10 @@ public class TbFcltInfrDto implements Serializable {
     @JsonProperty("istl_cmpy_id")
     private String istlCmpyId;
 
+    @ApiModelProperty("유지보수업체 ID")  // Y VARCHAR2(30)
+    @JsonProperty("maint_cmpy_id")
+    private String maintCmpyId;
+
     @ApiModelProperty("RFID ID")  // Y VARCHAR2(30)
     @JsonProperty("rfid_id")
     private String rfidId;
@@ -97,14 +101,18 @@ public class TbFcltInfrDto implements Serializable {
     @JsonProperty("work_step_desc")
     private String workStepDesc;
 
-    @ApiModelProperty("제조업체 ID")  // Y VARCHAR2(30)
+    @ApiModelProperty("제조업체 명")  // Y VARCHAR2(30)
     @JsonProperty("mnfc_cmpy_nm")
     private String mnfcCmpyNm;
 
-    @ApiModelProperty("설치업체 ID")  // Y VARCHAR2(30)
+    @ApiModelProperty("설치업체 명")  // Y VARCHAR2(30)
     @JsonProperty("istl_cmpy_nm")
     private String istlCmpyNm;
 
+    @ApiModelProperty("유지보수업체 명")  // Y VARCHAR2(30)
+    @JsonProperty("maint_cmpy_nm")
+    private String maintCmpyNm;
+
     @ApiModelProperty("관리책임자-정 사원번호(ID)")  // Y VARCHAR2(20)
     @JsonProperty("main_user_nm")
     private String mainUserNm;
@@ -162,14 +170,19 @@ public class TbFcltInfrDto implements Serializable {
 
         @ApiModelProperty("제조업체 ID, Nullable = Y, VARCHAR2(30)")  // Y VARCHAR2(30)
         @JsonProperty("mnfc_cmpy_id")
-        @Size(min=1, max=30)
+        @Size(max=30)
         private String mnfcCmpyId;
 
         @ApiModelProperty("설치업체 ID, Nullable = Y, VARCHAR2(30)")  // Y VARCHAR2(30)
         @JsonProperty("istl_cmpy_id")
-        @Size(min=1, max=30)
+        @Size(max=30)
         private String istlCmpyId;
 
+        @ApiModelProperty("유지보수업체 ID, Nullable = Y, VARCHAR2(30)")  // Y VARCHAR2(30)
+        @JsonProperty("maint_cmpy_id")
+        @Size(max=30)
+        private String maintCmpyId;
+
         @ApiModelProperty("RFID ID, Nullable = Y, VARCHAR2(30)")  // Y VARCHAR2(30)
         @JsonProperty("rfid_id")
         @Size(min=1, max=30)
@@ -212,7 +225,9 @@ public class TbFcltInfrDto implements Serializable {
         private String delYn;
 
         @Builder
-        public TbFcltInfrUpdReq(Long fclt_nmbr, String fclt_type, String fclt_id, String fclt_lctn, String istl_lctn_addr, String mdl_nm, Integer use_year, String istl_dt, String mnfc_cmpy_id, String istl_cmpy_id, String rfid_id, String main_user_id, String sub_user_id, String valid_ymd, String work_step, String abdn_dt, Long amt, String del_yn) {
+        public TbFcltInfrUpdReq(Long fclt_nmbr, String fclt_type, String fclt_id, String fclt_lctn, String istl_lctn_addr,
+                                String mdl_nm, Integer use_year, String istl_dt, String mnfc_cmpy_id, String istl_cmpy_id, String maint_cmpy_id,
+                                String rfid_id, String main_user_id, String sub_user_id, String valid_ymd, String work_step, String abdn_dt, Long amt, String del_yn) {
             this.fcltNmbr = fclt_nmbr;
             this.fcltType = fclt_type;
             this.fcltId = fclt_id;
@@ -223,6 +238,7 @@ public class TbFcltInfrDto implements Serializable {
             this.istlDt = istl_dt;
             this.mnfcCmpyId = mnfc_cmpy_id;
             this.istlCmpyId = istl_cmpy_id;
+            this.maintCmpyId = maint_cmpy_id;
             this.rfidId = rfid_id;
             this.mainUserId = main_user_id;
             this.subUserId = sub_user_id;
@@ -245,6 +261,7 @@ public class TbFcltInfrDto implements Serializable {
                     .istlDt(this.istlDt)
                     .mnfcCmpyId(this.mnfcCmpyId)
                     .istlCmpyId(this.istlCmpyId)
+                    .maintCmpyId(this.maintCmpyId)
                     .rfidId(this.rfidId)
                     .mainUserId(this.mainUserId)
                     .subUserId(this.subUserId)

src/main/java/com/its/op/entity/its/facility/TbFcltInfr.java

@@ -69,6 +69,10 @@ public class TbFcltInfr implements Serializable {
     @Column(name = "ISTL_CMPY_ID", length = 30)
     private String istlCmpyId;
 
+    @ApiModelProperty("유지보수업체 ID")  // Y VARCHAR2(30)
+    @Column(name = "MAINT_CMPY_ID", length = 30)
+    private String maintCmpyId;
+
     @ApiModelProperty("RFID ID")  // Y VARCHAR2(30)
     @Column(name = "RFID_ID", length = 30)
     private String rfidId;
@@ -111,6 +115,11 @@ public class TbFcltInfr implements Serializable {
     @NotFound(action = NotFoundAction.IGNORE)
     private TbFcltCmpy istlCmpy;
 
+    @OneToOne
+    @JoinColumn(insertable=false, updatable=false, name="MAINT_CMPY_ID", referencedColumnName = "CMPY_ID")
+    @NotFound(action = NotFoundAction.IGNORE)
+    private TbFcltCmpy maintCmpy;
+
     @OneToOne
     @JoinColumn(insertable=false, updatable=false, name="MAIN_USER_ID", referencedColumnName = "USER_ID")
     @NotFound(action = NotFoundAction.IGNORE)
@@ -134,6 +143,7 @@ public class TbFcltInfr implements Serializable {
                 .istlDt(this.istlDt)
                 .mnfcCmpyId(this.mnfcCmpyId)
                 .istlCmpyId(this.istlCmpyId)
+                .maintCmpyId(this.maintCmpyId)
                 .rfidId(this.rfidId)
                 .mainUserId(this.mainUserId)
                 .subUserId(this.subUserId)
@@ -151,6 +161,9 @@ public class TbFcltInfr implements Serializable {
         if (this.istlCmpy != null) {
             dto.setIstlCmpyNm(this.istlCmpy.getCmpyNm());
         }
+        if (this.maintCmpyId != null) {
+            dto.setMaintCmpyNm(this.maintCmpy.getCmpyNm());
+        }
         if (this.mainUser != null) {
             dto.setMainUserNm(this.mainUser.getName());
         }