港湾

src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java

@@ -77,7 +77,7 @@ public class SalaryAcctRecordBO {
                         if(!Objects.equals(salaryAcctRecordPO.getBackCalcStatus(),NumberUtils.INTEGER_ONE)){
                             btnList.add(new WeaTableOperate("删除", null, "1"));
                         }
-                        btnList.add(new WeaTableOperate("归档", null, "2"));
+                        // btnList.add(new WeaTableOperate("归档", null, "2"));
                     } else if (SalaryAcctRecordStatusEnum.ARCHIVED == salaryAcctRecordStatusEnum &&  ( salarySendMap.get(salaryAcctRecordPO.getId()) ==Boolean.TRUE  ) ){
                         btnList.add(new WeaTableOperate("查看", null, "3"));
                         btnList.add(new WeaTableOperate("重新核算", null, "4"));

src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.java

@@ -78,4 +78,6 @@ public interface SalaryAcctRecordMapper {
 	void updateLockSalaryItemIds(SalaryAcctRecordPO salaryAcctRecord);
 
     List<SalaryAcctRecordPO> getBackCalcRecordByIds(@Param("collection") Set<Long> salaryAcctIds);
+
+	void clearApprovalRequestId(@Param("id")Long id);
 }

src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml

@@ -426,4 +426,12 @@
         WHERE id = #{id} AND delete_type = 0
     </update>
 
+    <update id="clearApprovalRequestId">
+        UPDATE hrsa_salary_acct_record
+        <set>
+            approval_request_id = null,
+        </set>
+        WHERE id = #{id}
+    </update>
+
 </mapper>

src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java

@@ -693,6 +693,9 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe
 
         //删除报表缓存
         getSalaryStatisticsReportService(user).removeReportCache();
+
+        // 删除审批流程id
+        getSalaryAcctRecordMapper().clearApprovalRequestId(salaryAcctRecordPO.getId());
     }