Merge branch 'features/1.2.360_40870' into 'features/1.2.360'

#40870 【Check android 1.2.3.7】承認グループが複数設定された連続作業のプレビューに、1番目の承認結果が複数回表示される

See merge request !82

ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/TaskReportApprovalDao.java

@@ -94,7 +94,8 @@ public class TaskReportApprovalDao extends AbstractDao {
                         + "signature=?, "
                         + "status=? "
                         + "where process_key=? "
-                        + "and phase_no=? ",
+                        + "and phase_no=? "
+                        + "and approval_no=? ",
                 dto.getUpdateValues());
         return count > 0;
     }

ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/TaskReportApprovalDto.java

@@ -21,7 +21,7 @@ public class TaskReportApprovalDto extends AbstractDto {
 
     @Override
     public Object[] getUpdateValues() {
-        return new Object[] { approvalGroupId, approvalGroupName, approvalName, approvalNo, comment, sendbackPhaseNo, signature, status, processKey, phaseNo};
+        return new Object[] { approvalGroupId, approvalGroupName, approvalName, approvalNo, comment, sendbackPhaseNo, signature, status, processKey, phaseNo, approvalNo};
     }
 
     @Override