Commit 8db9a166 by Kim Jinsung

#39910 連続作業機能

①タスク削除時に承認情報削除されない問題対応
②phaseStatusのデフォルト値がnullの影響でネットワーク非接続時に報告したら、編集できない問題対応
parent 2324d341
...@@ -190,5 +190,8 @@ public class TaskDao extends AbstractDao { ...@@ -190,5 +190,8 @@ public class TaskDao extends AbstractDao {
delete("t_task_report", "task_key=?", dto.getKeyValues()); delete("t_task_report", "task_key=?", dto.getKeyValues());
delete("t_task_report_items", "task_key=?", dto.getKeyValues()); delete("t_task_report_items", "task_key=?", dto.getKeyValues());
delete("t_task_report_send", "task_key=?", dto.getKeyValues()); delete("t_task_report_send", "task_key=?", dto.getKeyValues());
if (dto.processKey != null) { //連続作業の承認情報
delete("t_task_report_approval", "process_key=?", new String[]{dto.processKey});
}
} }
} }
\ No newline at end of file
...@@ -16,8 +16,8 @@ public class TaskDto extends AbstractDto { ...@@ -16,8 +16,8 @@ public class TaskDto extends AbstractDto {
public String taskHotSpotInfo; public String taskHotSpotInfo;
public String taskName; public String taskName;
public Integer phaseNo; public Integer phaseNo;
public Integer phaseStatus; public Integer phaseStatus = 1; //デフォルト値1 (ネットワーク非接続時に報告した場合、1では無い時に編集できないため)
public Integer processStatus; public Integer processStatus = 0; //デフォルト値0
public String processKey; public String processKey;
public List<TaskReportDto> taskReportDtoList; public List<TaskReportDto> taskReportDtoList;
public List<TaskReportApprovalDto> taskReportApprovalDtoList; public List<TaskReportApprovalDto> taskReportApprovalDtoList;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment