소스 검색

提交新增合同文件校验

chenxiaofei 1 개월 전
부모
커밋
f6458f3a74

+ 5 - 1
sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/entity/KwcContractTrade.java

@@ -157,5 +157,9 @@ public class KwcContractTrade implements Serializable {
      */
     @TableField("salesman_phone")
     private String salesmanPhone;
-
+    /**
+     * 签约时间
+     */
+    @TableField("sign_time")
+    private Date signTime;
 }

+ 2 - 1
sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/operateService/KwcContractTradeService.java

@@ -1327,6 +1327,7 @@ public class KwcContractTradeService {
         //签约 (状态由带签约变成签约)
         if (Objects.equals(req.getStatus(), ContractStatusEnum.SIGNED.getCode()) && Objects.equals(kwcContractTrade.getStatus(), ContractStatusEnum.SUBMIT.getCode())) {
             updateKwcContractTrade.setStatus(ContractStatusEnum.SIGNED.getCode());
+            updateKwcContractTrade.setSignTime(new Date());
         }
         //手动完结 (如果不传状态就表示手动完结) 如果当前状态是待签约或者待签约 那么变为作废
         if (Objects.equals(req.getStatus(),ContractStatusEnum.CANNEL.getCode()) && Arrays.asList(ContractStatusEnum.WAIT_APPROVE.getCode(),
@@ -1581,7 +1582,7 @@ public class KwcContractTradeService {
         queryListResVo.setEndTime(t.getEndTime());
         queryListResVo.setInitiateTime(t.getCreateTime());
         queryListResVo.setRemark(t.getRemark());
-        queryListResVo.setSignTime(t.getCreateTime());
+        queryListResVo.setSignTime(t.getSignTime());
         return queryListResVo;
     }
 }

+ 1 - 1
sckw-modules/sckw-contract/src/main/resources/mapper/KwcContractTradeMapper.xml

@@ -220,7 +220,7 @@
         a.id,
         a.remark,
         a.signing_way,
-        a.create_time signTime,
+        a.signTime signTime,
         a.status,
         b.unit_type,
         b.ent_id,

+ 2 - 0
sql/2025/11/30/2025_11_30_cxf_alert.sql

@@ -4,6 +4,8 @@ ALTER TABLE kwc_contract_trade ADD unload_way tinyint      NOT NULL default 0  c
 ALTER TABLE kwc_contract_trade ADD salesman_id tinyint   NOT NULL default 0  comment '销售人员id(对应供应方的员工信息)';
 ALTER TABLE kwc_contract_trade ADD salesman_phone varchar(11)   NOT NULL default ''  comment '销售人员电话';
 
+ALTER TABLE kwc_contract_trade ADD sign_time  datetime   NULL  comment '签约时间';
+
 ALTER TABLE kwp_goods ADD price_unit varchar(10)   NOT NULL default ''  comment '价格单位(元,万元)';