修改合同状态

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/HouseholdContractEnum.java

@@ -23,7 +23,8 @@ public enum   HouseholdContractEnum {
     勘察状态_未勘察("未勘察", "未勘察"),
     勘察状态_已勘察("已勘察", "已勘察"),
     合同状态_未签署("未签署", "未签署"),
-    合同状态_已签署("已签署", "已签署"),
+    合同状态_农户已签署("农户已签署", "农户已签署"),
+    合同状态_双方已签署("双方已签署", "双方已签署"),
     合同状态_已作废("已作废", "已作废");
     /**
      * 名称，描述

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/DealerReviewMapper.xml

@@ -31,7 +31,8 @@
         d.next_process_node nextProcessNode,
         d.flow_task_id flowTaskId,
         d.plan_instance_id planInstanceId,
-        u.admin_user_id  adminUserId
+        u.admin_user_id  adminUserId,
+        u.regional_companies_name regionalCompaniesName
         from  hygf_commerce_info c  LEFT JOIN hygf_unit_info u on c.unit_seq=u.sequence_nbr LEFT JOIN hygf_dealer_review d on d.unit_info_id=u.sequence_nbr
         <where>
             u.is_delete=0

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/HouseholdContractController.java

@@ -158,6 +158,7 @@ public class HouseholdContractController extends BaseController {
 
         HouseholdContract householdContrac=  householdContractServiceImpl.getById(sequenceNbr);
         householdContrac.setSignStatus(HouseholdContractEnum.签字状态_已签字.getCode());
+        householdContrac.setStatus(HouseholdContractEnum.合同状态_农户已签署.getCode());
         return ResponseHelper.buildResponse(householdContractServiceImpl.updateById(householdContrac));
     }
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -168,7 +169,7 @@ public class HouseholdContractController extends BaseController {
         HouseholdContract householdContrac=  householdContractServiceImpl.getById(sequenceNbr);
         householdContrac.setStampStatus(HouseholdContractEnum.盖章状态_已盖章.getCode());
         householdContrac.setSigningTime(new Date());
-        householdContrac.setStatus(HouseholdContractEnum.合同状态_已签署.getCode());
+        householdContrac.setStatus(HouseholdContractEnum.合同状态_双方已签署.getCode());
         householdContrac.setSealedUser(getUserInfo().getRealName());
         return ResponseHelper.buildResponse(householdContractServiceImpl.updateById(householdContrac));
     }