sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/AgreementInfo.java

@@ -135,6 +135,4 @@ public class AgreementInfo extends BaseEntity {
     @ApiModelProperty(value = "导出选中列表")
     private List<Long> dataCondition;
 
-    private Integer isCommit;
-
 }

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SltAgreementInfoMapper.java

@@ -34,7 +34,6 @@ public interface SltAgreementInfoMapper {
     int insApply(SltAgreementApply apply);
 
     int insRelation(SltAgreementRelation relation);
-    int upRelation(SltAgreementRelation relation);
 
     int insDetails(SltAgreementInfo info);
 

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java

@@ -88,14 +88,8 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService {
     public int settlementReview(SltAgreementApply apply) {
         Long userid = SecurityUtils.getLoginUser().getUserid();
         apply.setAuditor(String.valueOf(userid));
-        int j;
-        if ("2".equals(apply.getStatus())) {
-            // 驳回
-            int i = sltAgreementInfoMapper.updateRelation(apply);
-            j = sltAgreementInfoMapper.updateApply(apply);
-        } else {
-           // 通过
         int i = sltAgreementInfoMapper.updateRelation(apply);
+        int j = 0;
         if (i > 0) {
             List<SltAgreementRelation> relations = sltAgreementInfoMapper.getRelations(apply);
             List<AgreementInfo> infos = new ArrayList<>();
@@ -116,7 +110,6 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService {
             throw new ServiceException("结算审核失败");
             //throw new ServiceException(ExceptionDict.SETTLEMENT_REVIEW_ERROR_MSG,ExceptionDict.SETTLEMENT_REVIEW_ERROR);
         }
-        }
         return j;
     }
 
@@ -188,7 +181,6 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService {
                 list.add(info);
                 relation.setApplyId(String.valueOf(apply.getId()));
                 sltAgreementInfoMapper.updateInfoStatus(relation.getAgreementId());
-                sltAgreementInfoMapper.upRelation(relation);
                 int j = sltAgreementInfoMapper.insRelation(relation);
                 if (j < 0) {
                     throw new ServiceException("新增协议结算记录失败");

sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml

@@ -91,16 +91,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where agreement_id = #{agreementId}
             and type_id = #{typeId}
     </update>
-    <delete id="upRelation">
-      update slt_agreement_relation
-      set is_commit = 1
-      where agreement_id = #{agreementId}
-    </delete>
     <select id="getSltAgreementInfo" resultType="com.bonus.sgzb.material.domain.AgreementInfo">
         SELECT bai.agreement_id, bai.agreement_code, contract_code,file_url ,file_name,sign_time,
         bui.unit_id,bui.unit_name , bp.lot_id as projectId , bp.lot_name as projectName,
-        plan_start_time,lease_day,auth_person,phone,saa.remark,bai.protocol,sar.cost as cost,sar.is_commit as isCommit,
+        plan_start_time,lease_day,auth_person,phone,saa.remark,bai.protocol,sar.cost as cost,
-        case when sar.id is null then '1' when sar.status = '0' then '2' when sar.status = '1' then '3' when sar.status = '2' then '4' end as sltStatus
+        case when sar.id is null then '1' when sar.status = '0' then '2' when sar.status = '1' then '3' end as sltStatus
         FROM bm_agreement_info bai
         LEFT JOIN bm_project_lot bp ON bp.lot_id = bai.project_id
         LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id
@@ -123,9 +118,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <when test="sltStatus == '3'.toString()">
                 and sar.status = '1'
             </when>
-            <when test="sltStatus == '4'.toString()">
-                and sar.status = '2'
-            </when>
         </choose>
         ORDER BY sltStatus,bai.agreement_id desc
     </select>